Merge branch 'master' of git://git.openpandora.org/pandora-libraries
authorvimacs <vimacs@pndtest>
Fri, 25 Dec 2009 16:47:07 +0000 (17:47 +0100)
committervimacs <vimacs@pndtest>
Fri, 25 Dec 2009 16:47:07 +0000 (17:47 +0100)

Trivial merge