Merge branch 'master' of git://openpandora.org/pandora-libraries
authorMichael Mrozek <EvilDragon@openpandora.de>
Fri, 2 Jul 2010 22:58:06 +0000 (00:58 +0200)
committerMichael Mrozek <EvilDragon@openpandora.de>
Fri, 2 Jul 2010 22:58:06 +0000 (00:58 +0200)

Trivial merge