Merge branch 'master' of git://git.openpandora.org/openpandora.oe
authorGrazvydas Ignotas <notasas@gmail.com>
Wed, 15 Feb 2012 01:37:54 +0000 (03:37 +0200)
committerGrazvydas Ignotas <notasas@gmail.com>
Wed, 15 Feb 2012 01:37:54 +0000 (03:37 +0200)
Conflicts:
recipes/images/pandora-xfce-image.bb

1  2 
recipes/images/pandora-xfce-image.bb

Simple merge