Merge branch 'backport' into 3.4
authorMikael Magnusson <mikachu@gmail.com>
Thu, 11 Mar 2010 13:29:53 +0000 (14:29 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Thu, 11 Mar 2010 13:29:53 +0000 (14:29 +0100)

Trivial merge