From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 14 Oct 2005 08:12:42 +0000 (+0000)
Subject: merge of 4719404458019fa92365a0f97202f5d145c24ff6
X-Git-Tag: Release-2010-05/1~9453^2~3261
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13f5e9484a442c5b0f5be1ce48714ae0d3010715;p=openembedded.git

merge of 4719404458019fa92365a0f97202f5d145c24ff6
     and 4a4dd989a03481d3137cc5c427bffabb4c7f99b6
---

13f5e9484a442c5b0f5be1ce48714ae0d3010715