From: Koen Kooi <koen@openembedded.org>
Date: Tue, 13 Mar 2007 16:39:04 +0000 (+0000)
Subject: merge of '4b6976e36ba815fc58bd0c8e4d468ba5c4d66aa9'
X-Git-Tag: Release-2010-05/1~8868^2~1092^2~1^2~7^2~17^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aabd49ceb5c40a792f09a2bc18c6d52b40ee9c96;p=openembedded.git

Merge ... '4b6976e36ba815fc58bd0c8e4d468ba5c4d66aa9'
     and '98c0a18ce7f822abf641bfdfe37edaf50f8a1a9f'
---

aabd49ceb5c40a792f09a2bc18c6d52b40ee9c96