Merge remote-tracking branch 'gcmalloc/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 26 Nov 2012 23:42:47 +0000 (00:42 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 26 Nov 2012 23:42:47 +0000 (00:42 +0100)

Trivial merge