From: Robert Schuster <thebohemian@gmx.net>
Date: Mon, 22 Sep 2008 22:00:12 +0000 (+0000)
Subject: merge of '52b9d3a5d26a11cc7dbe318e7eb6f1c3f6022b82'
X-Git-Tag: Release-2010-05/1~6022
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c48723e9b9adfc6a315e0da5f0dca7fa41c2ed76;p=openembedded.git

Merge ... '52b9d3a5d26a11cc7dbe318e7eb6f1c3f6022b82'
     and '5f87d1f1d728ca3992204c4cc56b070c3c58ac25'
---

c48723e9b9adfc6a315e0da5f0dca7fa41c2ed76