Merge branch 'master' of git://git.openpandora.org/openpandora.oe
authorDavid-John Willis <John.Willis@Distant-earth.com>
Wed, 7 Apr 2010 21:28:08 +0000 (22:28 +0100)
committerDavid-John Willis <John.Willis@Distant-earth.com>
Wed, 7 Apr 2010 21:28:08 +0000 (22:28 +0100)
commite7a36d87ca15008c9434ef7634c944e59a663524
tree7a9383cd3e44a0e1a6e0426b0bc431300ba1c2b8
parentf481acfb5b96156d1ad3d11df57756274367ec76
parent0bc901cc583ccd9cdec3f61b3c8f8e32b4bb2a22
Merge branch 'master' of git://git.openpandora.org/openpandora.oe

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