From: Grazvydas Ignotas <notasas@gmail.com>
Date: Wed, 15 Feb 2012 01:37:54 +0000 (+0200)
Subject: Merge branch 'master' of git://git.openpandora.org/openpandora.oe
X-Git-Tag: sz_beta3~37
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a58c7f61a22c607a46879abe5350f792a256c98;p=openpandora.oe.git

Merge branch 'master' of git://git.openpandora.org/openpandora.oe

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

3a58c7f61a22c607a46879abe5350f792a256c98