Merge branch 'master' of git://openpandora.org/openpandora.oe
authorMichael Mrozek <EvilDragon@openpandora.de>
Tue, 7 Jun 2011 10:24:25 +0000 (12:24 +0200)
committerMichael Mrozek <EvilDragon@openpandora.de>
Tue, 7 Jun 2011 10:24:25 +0000 (12:24 +0200)

Trivial merge