Merge branch 'master' of git://openpandora.org/openpandora.oe
authorMichael Mrozek <EvilDragon@openpandora.de>
Sat, 28 May 2011 01:33:34 +0000 (03:33 +0200)
committerMichael Mrozek <EvilDragon@openpandora.de>
Sat, 28 May 2011 01:33:34 +0000 (03:33 +0200)

Trivial merge