From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 23 Apr 2006 16:29:33 +0000 (+0000)
Subject: merge of d23a51fd3de55ab7bd14228f1701651fb28530e6
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e99fa15bdf99ddef110d2ed419e3f67fd47c94de;p=openembedded.git

merge of d23a51fd3de55ab7bd14228f1701651fb28530e6
     and e399d3faf8861b253531bf4ec2dbec4e5ea1af2b
---

e99fa15bdf99ddef110d2ed419e3f67fd47c94de