From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 14 Nov 2006 16:43:16 +0000 (+0000)
Subject: merge of 74c6df5277dd79cbaaba08bdb441d1299119179e
X-Git-Tag: Release-2010-05/1~9453^2~503
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae0ecca55bad0359a0d4857597ef5398ee869cef;p=openembedded.git

merge of 74c6df5277dd79cbaaba08bdb441d1299119179e
     and f3e744d286e5596939ace0b10699542f2cc2a925
---

ae0ecca55bad0359a0d4857597ef5398ee869cef