From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 2 Aug 2007 15:23:39 +0000 (+0000)
Subject: merge of '2c4ce910697bba06555153194e59aa010346bb7c'
X-Git-Tag: Release-2010-05/1~8868^2~41^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aec58ee07ec82bc25841e37fd9a3ef7cd6b7ce6c;p=openembedded.git

Merge ... '2c4ce910697bba06555153194e59aa010346bb7c'
     and '8b8fb841c5173c325347c89a0c911e34aff7fdd3'
---

aec58ee07ec82bc25841e37fd9a3ef7cd6b7ce6c