b=11039
i=alex
i=adilger

mballoc3 patch against 2.6.18: fix conflicts with bug 12746.