From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 3 Sep 2007 19:35:03 +0000 (+0000)
Subject: merge of '7eb72993f7971af5ed6ca074f12728e72fab4af9'
X-Git-Tag: Release-2010-05/1~8718^2~20^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49001370d6c3f47b2f97ab490136bb7c897eda10;p=openembedded.git

Merge ... '7eb72993f7971af5ed6ca074f12728e72fab4af9'
     and 'b04a5865f2f7f8e22f7323e2a3e613909162c33f'
---

49001370d6c3f47b2f97ab490136bb7c897eda10