From: David-John Willis <John.Willis@Distant-earth.com>
Date: Tue, 11 May 2010 13:33:58 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openpandora.org/openpandora.oe
X-Git-Tag: Release-2010-05/1~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d36e67967e630656e631094369154d03ec7653da;p=openpandora.oe.git

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

d36e67967e630656e631094369154d03ec7653da