From: Koen Kooi <koen@openembedded.org>
Date: Fri, 7 Dec 2007 10:18:10 +0000 (+0000)
Subject: merge of '40faf7d48d883c5cd0bb74d8c212de805ef7cdf3'
X-Git-Tag: Release-2010-05/1~8180^2~10^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c16ea23180e220831092ed326a3cfdf79517fd59;p=openembedded.git

Merge ... '40faf7d48d883c5cd0bb74d8c212de805ef7cdf3'
     and 'f564197dcff7dea800a0dcabf27c4809e2521c8c'
---

c16ea23180e220831092ed326a3cfdf79517fd59