Merge branch 'master' of git://openpandora.org/openpandora.oe
authorMichael Mrozek <EvilDragon@openpandora.de>
Wed, 14 Jul 2010 23:01:56 +0000 (01:01 +0200)
committerMichael Mrozek <EvilDragon@openpandora.de>
Wed, 14 Jul 2010 23:01:56 +0000 (01:01 +0200)

Trivial merge