From: Koen Kooi <koen@openembedded.org>
Date: Tue, 2 Jan 2007 19:31:02 +0000 (+0000)
Subject: merge of '1944e442d97092991784475bf4b8980e60c5c3fc'
X-Git-Tag: Release-2010-05/1~9453^2~34^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cfc3d5ccd4cd3dc572958bdad127856be41cb2c;p=openembedded.git

Merge ... '1944e442d97092991784475bf4b8980e60c5c3fc'
     and 'c6043a6be9941ce6182b30748b51b8f191e04bc8'
---

4cfc3d5ccd4cd3dc572958bdad127856be41cb2c