From: Koen Kooi <koen@openembedded.org>
Date: Wed, 22 Feb 2006 10:58:26 +0000 (+0000)
Subject: merge of 4ed0964b486b99773aa438f582fa52d0b4e9b0d1
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~87
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdc9958bc3e33f43ead639f6a3acef0f744f9c4b;p=openembedded.git

merge of 4ed0964b486b99773aa438f582fa52d0b4e9b0d1
     and 95868ff13ffd9c5a92e6e0ae4637b3e07e4a626d
---

fdc9958bc3e33f43ead639f6a3acef0f744f9c4b