From: David-John Willis <John.Willis@Distant-earth.com>
Date: Mon, 12 Apr 2010 10:05:28 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openpandora.org/openpandora.oe
X-Git-Tag: Release-2010-05/1~60
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8487fd142b12af25708c6b6e92ebfd57ca8ea795;p=openpandora.oe.git

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

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

8487fd142b12af25708c6b6e92ebfd57ca8ea795