Merge branch 'master' of git://openpandora.org/openpandora.oe
authorMichael Mrozek <EvilDragon@openpandora.de>
Sun, 23 Jan 2011 11:22:06 +0000 (12:22 +0100)
committerMichael Mrozek <EvilDragon@openpandora.de>
Sun, 23 Jan 2011 11:22:06 +0000 (12:22 +0100)

Trivial merge