From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 19 Feb 2008 16:17:33 +0000 (+0000)
Subject: merge of '4f1c373d43a7c1b912b21780d67df8ccec796116'
X-Git-Tag: Release-2010-05/1~7665
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f55e1cd950a96045de381abedde9e2727d001234;p=openembedded.git

Merge ... '4f1c373d43a7c1b912b21780d67df8ccec796116'
     and 'd684223b6fbdf20a18d598446664827707b7dd91'
---

f55e1cd950a96045de381abedde9e2727d001234