Merge branch 'master' of git://git.openpandora.org/openpandora.oe
authorDavid-John Willis <John.Willis@Distant-earth.com>
Thu, 8 Apr 2010 07:09:17 +0000 (08:09 +0100)
committerDavid-John Willis <John.Willis@Distant-earth.com>
Thu, 8 Apr 2010 07:09:17 +0000 (08:09 +0100)
commit1ebb54e2f3460c30bd3bb4802bc4b2a5b94a9220
treef91dd69214a84cf2ad80150cf5312fe5f86b33b8
parente7a36d87ca15008c9434ef7634c944e59a663524
parent0e68b5a9ee10bd842b9e7c541cc1016af8f2b97a
Merge branch 'master' of git://git.openpandora.org/openpandora.oe

Conflicts:
recipes/pandora-system/pandora-scripts.bb
recipes/pandora-system/pandora-scripts.bb