From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 11 Jul 2008 09:12:41 +0000 (+0000)
Subject: merge of '6c2994d284da06ed60c607d89622f27c35c68b0e'
X-Git-Tag: Release-2010-05/1~6543^2~7^2~39
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c402c5af43c5881feba53c224b27cb2f0c58bec0;p=openembedded.git

Merge ... '6c2994d284da06ed60c607d89622f27c35c68b0e'
     and 'da3452ccd1d6234cb9dbbfb85923cce269a1daa7'
---

c402c5af43c5881feba53c224b27cb2f0c58bec0