Merge branch 'master' of git://git.openpandora.org/pandora-libraries
authorvimacs <vimacs@pndtest>
Sat, 19 Dec 2009 02:43:21 +0000 (03:43 +0100)
committervimacs <vimacs@pndtest>
Sat, 19 Dec 2009 02:43:21 +0000 (03:43 +0100)

Trivial merge