From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 16 Nov 2007 18:24:30 +0000 (+0000)
Subject: merge of '30d6a9a8f183fa3269a65f234e3bf92f0da8eff5'
X-Git-Tag: Release-2010-05/1~8380^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69a8b4053ee2673dad2a1255adc59bc1fb2bca29;p=openembedded.git

Merge ... '30d6a9a8f183fa3269a65f234e3bf92f0da8eff5'
     and '63a3f2a77fbdf77ef9318ceb182fd3be38d68562'
---

69a8b4053ee2673dad2a1255adc59bc1fb2bca29