From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 2 Apr 2007 15:53:48 +0000 (+0000)
Subject: merge of '2550a6545e07449f49f20d9d0ff1bc4dd316bcaa'
X-Git-Tag: Release-2010-05/1~8868^2~851
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd2eadf880b94eaaa56e745a0b9b55ecbda0e194;p=openembedded.git

Merge ... '2550a6545e07449f49f20d9d0ff1bc4dd316bcaa'
     and '6bc2006eb8eff633170fcf544612bf6bcc7be7be'
---

cd2eadf880b94eaaa56e745a0b9b55ecbda0e194