From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 1 Aug 2006 16:25:02 +0000 (+0000)
Subject: merge of 2e4e17489b3fa4aeb0a87a036efb8b485adec26b
X-Git-Tag: Release-2010-05/1~9453^2~1027
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fe2c861b31baa7c6083223d0a995f2ebe2d51bf;p=openembedded.git

merge of 2e4e17489b3fa4aeb0a87a036efb8b485adec26b
     and 58ff55500be03d6f8ddc5c54027951e93cf4b7a2
---

0fe2c861b31baa7c6083223d0a995f2ebe2d51bf