Merge branch 'master' of git://openpandora.org/openpandora.oe
authorMichael Mrozek <EvilDragon@openpandora.org>
Thu, 8 Apr 2010 20:01:15 +0000 (22:01 +0200)
committerMichael Mrozek <EvilDragon@openpandora.org>
Thu, 8 Apr 2010 20:01:15 +0000 (22:01 +0200)

Trivial merge