From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 11 Apr 2006 13:56:01 +0000 (+0000)
Subject: merge of 8f860e5acf5f3449ded79e9bc876a6b5b70cbc47
X-Git-Tag: Release-2010-05/1~9453^2~2068
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73bb03136687ce1e0c74129c389cf8f3029c05d2;p=openembedded.git

merge of 8f860e5acf5f3449ded79e9bc876a6b5b70cbc47
     and fde5a287da3f85a26581cb7c6634cc8fb3ca4a59
---

73bb03136687ce1e0c74129c389cf8f3029c05d2