From: Koen Kooi <koen@openembedded.org>
Date: Tue, 25 Apr 2006 14:07:26 +0000 (+0000)
Subject: merge of 487e52f30ac1424e4299105affc248ed1bcb625e
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e43eaa96d2faef4cd42fa8d4891d753bd43b94a5;p=openembedded.git

merge of 487e52f30ac1424e4299105affc248ed1bcb625e
     and 92f1863582beb464976477bbff8bf4941acbc8f1
---

e43eaa96d2faef4cd42fa8d4891d753bd43b94a5