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

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

accc69e04e0f330b0187a38d4728ef33eaed1ed2