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)

Trivial merge