Merge branch 'backport' into 3.4
authorMikael Magnusson <mikachu@gmail.com>
Sat, 13 Mar 2010 21:04:27 +0000 (22:04 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Sat, 13 Mar 2010 21:04:27 +0000 (22:04 +0100)

Trivial merge