From: vimacs <vimacs@pndtest>
Date: Fri, 25 Dec 2009 16:47:07 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openpandora.org/pandora-libraries
X-Git-Tag: Release-2010-05/1~131
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e77e54bc2047ec4ebe900b2ccb74a178be17b4bf;p=pandora-libraries.git

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

e77e54bc2047ec4ebe900b2ccb74a178be17b4bf