Merge branch 'master' of git://git.openpandora.org/openpandora.oe
authorDavid-John Willis <John.Willis@Distant-earth.com>
Mon, 12 Apr 2010 10:05:28 +0000 (11:05 +0100)
committerDavid-John Willis <John.Willis@Distant-earth.com>
Mon, 12 Apr 2010 10:05:28 +0000 (11:05 +0100)
Conflicts:
recipes/tasks/task-pandora-xfce.bb

1  2 
recipes/tasks/task-pandora-xfce.bb

Simple merge