Merge branch 'master' of git://openpandora.org/openpandora.oe
authorMichael Mrozek <EvilDragon@openpandora.de>
Thu, 6 May 2010 23:59:45 +0000 (01:59 +0200)
committerMichael Mrozek <EvilDragon@openpandora.de>
Thu, 6 May 2010 23:59:45 +0000 (01:59 +0200)

Trivial merge