Merge branch 'master' of git://openpandora.org/pandora-libraries
authorMichael Mrozek <EvilDragon@openpandora.de>
Sun, 16 Jan 2011 21:06:59 +0000 (22:06 +0100)
committerMichael Mrozek <EvilDragon@openpandora.de>
Sun, 16 Jan 2011 21:06:59 +0000 (22:06 +0100)

Trivial merge