From: David-John Willis <John.Willis@Distant-earth.com>
Date: Wed, 29 Sep 2010 12:07:54 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openpandora.org/openpandora.oe
X-Git-Tag: sz_beta3~235
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6abe5a959df73b97c99c6318420e11013e273344;p=openpandora.oe.git

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

Conflicts:
	recipes/tasks/task-pandora-core.bb
---

6abe5a959df73b97c99c6318420e11013e273344