From: vimacs <vimacs@pndtest>
Date: Mon, 21 Dec 2009 22:39:28 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openpandora.org/pandora-libraries
X-Git-Tag: Release-2010-05/1~138
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d37ba87552ad10728ff3342b1b42c2d03384dfec;p=pandora-libraries.git

Merge branch 'master' of git://git.openpandora.org/pandora-libraries
---

d37ba87552ad10728ff3342b1b42c2d03384dfec