Merge branch 'master' of git://git.openpandora.org/pandora-libraries
authorvimacs <vimacs@pndtest>
Thu, 17 Dec 2009 02:35:11 +0000 (03:35 +0100)
committervimacs <vimacs@pndtest>
Thu, 17 Dec 2009 02:35:11 +0000 (03:35 +0100)

Trivial merge