Merge branch 'master' of git://git.openpandora.org/pandora-libraries
authorvimacs <vimacs@pndtest>
Sun, 15 Nov 2009 00:02:53 +0000 (01:02 +0100)
committervimacs <vimacs@pndtest>
Sun, 15 Nov 2009 00:02:53 +0000 (01:02 +0100)

Trivial merge