From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 25 Oct 2007 16:17:01 +0000 (+0000)
Subject: merge of '0b6354a57db70b62eccbe5522490947545014f85'
X-Git-Tag: Release-2010-05/1~8454^2~120^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e30a33ca971f9ad5b265d98ddb173fc0b7a8e22e;p=openembedded.git

Merge ... '0b6354a57db70b62eccbe5522490947545014f85'
     and 'bfb3f591b7494217c22a8a5b6daf3902bdd7cd03'
---

e30a33ca971f9ad5b265d98ddb173fc0b7a8e22e