Merge branch 'master' of git://git.openpandora.org/pandora-libraries
authorvimacs <vimacs@pndtest>
Mon, 9 Nov 2009 21:36:19 +0000 (22:36 +0100)
committervimacs <vimacs@pndtest>
Mon, 9 Nov 2009 21:36:19 +0000 (22:36 +0100)

Trivial merge