Merge branch 'master' of git://git.openpandora.org/pandora-libraries
authorvimacs <vimacs@pndtest>
Mon, 15 Feb 2010 18:52:03 +0000 (19:52 +0100)
committervimacs <vimacs@pndtest>
Mon, 15 Feb 2010 18:52:03 +0000 (19:52 +0100)

Trivial merge