From: Koen Kooi <koen@openembedded.org>
Date: Fri, 30 Mar 2007 17:49:35 +0000 (+0000)
Subject: merge of '3ec01b0a91ae1b235f0cba59ba95f67f6b6f859f'
X-Git-Tag: Release-2010-05/1~8868^2~879
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2ddbcc43d7515d14d9d7ffb6d6b6ed3dcd1881d;p=openembedded.git

Merge ... '3ec01b0a91ae1b235f0cba59ba95f67f6b6f859f'
     and 'ff4cec497cf85d040a1be5d8659847f858cdd4c9'
---

f2ddbcc43d7515d14d9d7ffb6d6b6ed3dcd1881d