From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 12 Jul 2006 21:27:34 +0000 (+0000)
Subject: merge of 11d8497b1833de1683f037417535cc4ba64608f3
X-Git-Tag: Release-2010-05/1~9453^2~1237
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c83778e31aaaa2c9c70872795aaef94e3fa5872;p=openembedded.git

merge of 11d8497b1833de1683f037417535cc4ba64608f3
     and 85921202b8fd4be54741cadc9cbf9c3768a9b23a
---

4c83778e31aaaa2c9c70872795aaef94e3fa5872