From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 31 Jul 2007 16:21:16 +0000 (+0000)
Subject: merge of '15b74f4a5710e603d60db9716cb6cb0619511ac7'
X-Git-Tag: Release-2010-05/1~8868^2~64
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e61dfe7129ee23bc41ba1ada89eedf3245a16ca;p=openembedded.git

Merge ... '15b74f4a5710e603d60db9716cb6cb0619511ac7'
     and '8961e177cdb0b701e3bb0304ec24d5c4a3947254'
---

2e61dfe7129ee23bc41ba1ada89eedf3245a16ca