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)
commit6abe5a959df73b97c99c6318420e11013e273344
tree310185b41c0c144d62f43d307d97ed6c8f7b6e57
parented652dcc533aee328e891255f8f19e258de0e8d5
parent9383e95abcee2ac08a998c6fbe17bb945bf1c732
Merge branch 'master' of git://git.openpandora.org/openpandora.oe

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