Merge branch 'master' of git://openpandora.org/pandora-libraries
authorMichael Mrozek <EvilDragon@openpandora.de>
Mon, 19 Jul 2010 00:14:09 +0000 (02:14 +0200)
committerMichael Mrozek <EvilDragon@openpandora.de>
Mon, 19 Jul 2010 00:14:09 +0000 (02:14 +0200)

Trivial merge