From: vimacs <vimacs@pndtest>
Date: Wed, 10 Mar 2010 15:23:32 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openpandora.org/pandora-libraries
X-Git-Tag: Release-2010-05/1~63^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e60400f406ec9f5eddf6fa23da85fdb092e2ec30;p=pandora-libraries.git

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

e60400f406ec9f5eddf6fa23da85fdb092e2ec30