Merge branch 'master' of git://openpandora.org/pandora-misc
authorMichael Mrozek <EvilDragon@openpandora.de>
Fri, 4 Mar 2011 23:07:10 +0000 (00:07 +0100)
committerMichael Mrozek <EvilDragon@openpandora.de>
Fri, 4 Mar 2011 23:07:10 +0000 (00:07 +0100)

Trivial merge