From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 30 Jun 2006 13:16:28 +0000 (+0000)
Subject: merge of 6a09c229506ea55e94d418d22f102bba3d356a32
X-Git-Tag: Release-2010-05/1~9453^2~1400
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f6d1ebb7e929f78b202e9291cc8c32df2a1bb42;p=openembedded.git

merge of 6a09c229506ea55e94d418d22f102bba3d356a32
     and cc1957ee71fb122edc5add46a814a263c80bbe85
---

4f6d1ebb7e929f78b202e9291cc8c32df2a1bb42