From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 28 Feb 2008 13:41:04 +0000 (+0000)
Subject: merge of '425c38aa299f3015ce439347ec5c8736d76b984b'
X-Git-Tag: Release-2010-05/1~7572^2~41
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56f58480bba3cc430a788c9d6c9abd371040f68e;p=openembedded.git

Merge ... '425c38aa299f3015ce439347ec5c8736d76b984b'
     and '4e11ae888ef9a24373e696b3cd581aab1009b46d'
---

56f58480bba3cc430a788c9d6c9abd371040f68e