Merge branch 'master' of git://git.openpandora.org/pandora-libraries
authorvimacs <vimacs@pndtest>
Thu, 11 Mar 2010 15:57:09 +0000 (16:57 +0100)
committervimacs <vimacs@pndtest>
Thu, 11 Mar 2010 15:57:09 +0000 (16:57 +0100)

Trivial merge