Merge branch 'master' of git://openpandora.org/openpandora.oe
authorMichael Mrozek <EvilDragon@openpandora.de>
Fri, 23 Apr 2010 00:43:33 +0000 (02:43 +0200)
committerMichael Mrozek <EvilDragon@openpandora.de>
Fri, 23 Apr 2010 00:43:33 +0000 (02:43 +0200)

Trivial merge