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

Trivial merge