From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 22 Mar 2006 18:17:16 +0000 (+0000)
Subject: merge of 085d7150845adc7b63d27d8e1468741c72a3561b
X-Git-Tag: Release-2010-05/1~9453^2~2166
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9655b8ae14b83232a594a63ff1af1c4377de61a0;p=openembedded.git

merge of 085d7150845adc7b63d27d8e1468741c72a3561b
     and 48c734b5e2a4506518472e70e77b4699c76a92b3
---

9655b8ae14b83232a594a63ff1af1c4377de61a0