From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 20 Apr 2006 14:42:43 +0000 (+0000)
Subject: merge of b527e063b110f80270c8dc87e41ce53a83d4870a
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~50^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccd41a11e5dd1de18867049b30a76ad8137a97ef;p=openembedded.git

merge of b527e063b110f80270c8dc87e41ce53a83d4870a
     and c8b301a65a734bb6f775222ccee1d1e8e7372ba3
---

ccd41a11e5dd1de18867049b30a76ad8137a97ef