From: Adrian Davey <ade@beth2.org>
Date: Thu, 26 Oct 2006 16:13:36 +0000 (+0000)
Subject: merge of '185633f8bb0ba884443e170989d375777cc45902'
X-Git-Tag: Release-2010-05/1~9453^2~573^2^2~8^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddabd9e011313a30d1c1c8e0ccbbba7702a7fff5;p=openembedded.git

Merge ... '185633f8bb0ba884443e170989d375777cc45902'
     and 'b2bf808e19242492fbacc8cb80f1ee6d64565706'
---

ddabd9e011313a30d1c1c8e0ccbbba7702a7fff5