From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 6 May 2006 16:57:37 +0000 (+0000)
Subject: merge of 887360a0dd0ab194c55c98aec0baaf069e32fe47
X-Git-Tag: Release-2010-05/1~9453^2~1769^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90d7e5110319cc4ab6b5e47af5e989b58004ee2f;p=openembedded.git

merge of 887360a0dd0ab194c55c98aec0baaf069e32fe47
     and a13924bae0fe62a4c39522bed9d21b03032f0d8a
---

90d7e5110319cc4ab6b5e47af5e989b58004ee2f