From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 8 Jun 2006 17:11:58 +0000 (+0000)
Subject: merge of 431299faa1c58d0b74b78c0214c3d6e1ca32abfe
X-Git-Tag: Release-2010-05/1~9453^2~1490
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22fc6682380c5bfba7a31ef91a76f6b3016ea90b;p=openembedded.git

merge of 431299faa1c58d0b74b78c0214c3d6e1ca32abfe
     and 63331b30a6c2ad99fdbd6a71b486885353b4821d
---

22fc6682380c5bfba7a31ef91a76f6b3016ea90b