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)
commit8487fd142b12af25708c6b6e92ebfd57ca8ea795
tree4a8406e2f599c1a066e49b293b2a9938057aa7c5
parentc5cce2c0de7b09c4a4c3b88d1e18b633bc65dc79
parentb885fb5a76553e610979c07e252bcd08e7d1b8e8
Merge branch 'master' of git://git.openpandora.org/openpandora.oe

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