Merge branch 'master' of git://git.openpandora.org/pandora-libraries
authorvimacs <vimacs@pndtest>
Fri, 5 Mar 2010 15:40:45 +0000 (16:40 +0100)
committervimacs <vimacs@pndtest>
Fri, 5 Mar 2010 15:40:45 +0000 (16:40 +0100)

Trivial merge