Merge branch 'master' of git://git.openpandora.org/openpandora.oe
authorDavid-John Willis <John.Willis@Distant-earth.com>
Wed, 29 Sep 2010 12:07:54 +0000 (13:07 +0100)
committerDavid-John Willis <John.Willis@Distant-earth.com>
Wed, 29 Sep 2010 12:07:54 +0000 (13:07 +0100)
Conflicts:
recipes/tasks/task-pandora-core.bb

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

Simple merge