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)
commit3a58c7f61a22c607a46879abe5350f792a256c98
treea856808df6c6d41fd1f221530d55ab406eaef5bb
parent8fcd62562d5669bbe6eac8451e1428dae5e75239
parent44c4c9272d881ed786f6650440cd8a0936b8fd5d
Merge branch 'master' of git://git.openpandora.org/openpandora.oe

Conflicts:
recipes/images/pandora-xfce-image.bb
recipes/images/pandora-xfce-image.bb