Merge branch 'master' of git://git.openpandora.org/pandora-libraries
authorvimacs <vimacs@pndtest>
Thu, 18 Feb 2010 14:53:08 +0000 (15:53 +0100)
committervimacs <vimacs@pndtest>
Thu, 18 Feb 2010 14:53:08 +0000 (15:53 +0100)

Trivial merge