From: Koen Kooi <koen@openembedded.org>
Date: Tue, 12 Aug 2008 14:21:40 +0000 (+0000)
Subject: merge of '1e0c7e9af08cc3d33b61608f1780d80214f1c51a'
X-Git-Tag: Release-2010-05/1~6333^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb857117246bcabd2a849d95c8bf84c01c6635ef;p=openembedded.git

Merge ... '1e0c7e9af08cc3d33b61608f1780d80214f1c51a'
     and 'f236af3007cc25b83011ee388e69831ee54c7be7'
---

bb857117246bcabd2a849d95c8bf84c01c6635ef