From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 22 Apr 2006 16:00:51 +0000 (+0000)
Subject: merge of 492a286523344c6075a8e8afbb49f5b13be91738
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~38^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc8717fdc175eaa41759eb91179af83e105e075e;p=openembedded.git

merge of 492a286523344c6075a8e8afbb49f5b13be91738
     and d68918ea3df82803fb2bfefa0cbbdac04811caa7
---

bc8717fdc175eaa41759eb91179af83e105e075e