From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Sun, 12 Aug 2007 22:00:43 +0000 (+0000)
Subject: merge of '65fb29ae308602940228134ed6cbae42627b7c1e'
X-Git-Tag: Release-2010-05/1~8987^2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3945a4760d0223baf60983c4857a6b51ac66981d;p=openembedded.git

Merge ... '65fb29ae308602940228134ed6cbae42627b7c1e'
     and '7a67ee2faf59e6803887617211f99fcc2f9cf4e7'
---

3945a4760d0223baf60983c4857a6b51ac66981d