Merge branch 'master' of git://openpandora.org/openpandora.oe
authorMichael Mrozek <EvilDragon@openpandora.de>
Tue, 11 May 2010 00:57:45 +0000 (02:57 +0200)
committerMichael Mrozek <EvilDragon@openpandora.de>
Tue, 11 May 2010 00:57:45 +0000 (02:57 +0200)

Trivial merge