Merge remote-tracking branch 'gcmalloc/master' into fork_master
authorFilippo Valsorda <filippo.valsorda@gmail.com>
Wed, 12 Dec 2012 13:11:40 +0000 (14:11 +0100)
committerFilippo Valsorda <filippo.valsorda@gmail.com>
Wed, 12 Dec 2012 13:11:40 +0000 (14:11 +0100)

Trivial merge