Merge branch 'backport' into 3.4
authorMikael Magnusson <mikachu@gmail.com>
Fri, 14 May 2010 13:52:18 +0000 (15:52 +0200)
committerMikael Magnusson <mikachu@gmail.com>
Fri, 14 May 2010 13:52:18 +0000 (15:52 +0200)
commit714bed593263b2f75db463da3ec63e391e71a462
tree4fff9dee76f971a03e1093bb412767886f8eb005
parent5416633ea89750ad7edb5ecb0f1106aa1775a079
parente42d9ca9295234af44e0956e6d1327adc321cfc4
Merge branch 'backport' into 3.4