Merge branch 'master' of git://git.openpandora.org/pandora-libraries
authorvimacs <vimacs@pndtest>
Wed, 10 Mar 2010 15:31:53 +0000 (16:31 +0100)
committervimacs <vimacs@pndtest>
Wed, 10 Mar 2010 15:31:53 +0000 (16:31 +0100)

Trivial merge