From: Koen Kooi <koen@openembedded.org>
Date: Wed, 28 Feb 2007 09:00:38 +0000 (+0000)
Subject: merge of '7f12c033c369afe355ed9fdfe14dfe1531391fac'
X-Git-Tag: Release-2010-05/1~9133^2~18^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe21f33928a3b14e7e735a83621b495500897b04;p=openembedded.git

Merge ... '7f12c033c369afe355ed9fdfe14dfe1531391fac'
     and 'ff3d5f3c2da8091a3128fc9c708e8b9fac5d9a8f'
---

fe21f33928a3b14e7e735a83621b495500897b04