From: vimacs <vimacs@pndtest>
Date: Thu, 11 Mar 2010 15:57:09 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openpandora.org/pandora-libraries
X-Git-Tag: Release-2010-05/1~59^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a9e94121268f17199ca259289ca4a8d252913e7;p=pandora-libraries.git

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

6a9e94121268f17199ca259289ca4a8d252913e7