Merge branch '3.4' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Sat, 23 Aug 2008 04:32:25 +0000 (06:32 +0200)
committerMikael Magnusson <mikachu@gmail.com>
Sat, 23 Aug 2008 04:32:25 +0000 (06:32 +0200)

Trivial merge