Merge branch 'master' of git://git.openpandora.org/pandora-libraries
authorvimacs <vimacs@pndtest>
Mon, 21 Dec 2009 22:39:28 +0000 (23:39 +0100)
committervimacs <vimacs@pndtest>
Mon, 21 Dec 2009 22:39:28 +0000 (23:39 +0100)

Trivial merge