From: Koen Kooi <koen@openembedded.org>
Date: Wed, 10 Oct 2007 08:57:19 +0000 (+0000)
Subject: merge of '6f164d924ef877e9361c0f48667e2ef44a9addcc'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~104^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2eb5a3d80018bcfb02586f03f22745d50e327547;p=openembedded.git

Merge ... '6f164d924ef877e9361c0f48667e2ef44a9addcc'
     and 'ada2b5e6f0e360127442cd1510cd4740e48a91e8'
---

2eb5a3d80018bcfb02586f03f22745d50e327547