From: David-John Willis <John.Willis@Distant-earth.com>
Date: Thu, 3 Jun 2010 18:17:26 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openpandora.org/openpandora.oe
X-Git-Tag: sz_beta3~266
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e573e486201aa4146e8148f952cbe821c424b268;p=openpandora.oe.git

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

e573e486201aa4146e8148f952cbe821c424b268