From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 25 Apr 2006 18:50:58 +0000 (+0000)
Subject: merge of 21858366d3f1cd69225dc0db2af6109cdd227145
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=276625340e2e1a0a083f59b7e4b82185de3edfce;p=openembedded.git

merge of 21858366d3f1cd69225dc0db2af6109cdd227145
     and caff9d7758bbac1a8819824a3d56cef092f94ca8
---

276625340e2e1a0a083f59b7e4b82185de3edfce