From: Philip Balister <philip@balister.org>
Date: Sun, 3 Dec 2006 15:01:20 +0000 (+0000)
Subject: merge of '82ba6ac51742ea64d989ab1d8b3b4633425bcd41'
X-Git-Tag: Release-2010-05/1~9453^2~204^2~27^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acfb7d8bb9d2c2d22232e75836d563f02c2aca6f;p=openembedded.git

Merge ... '82ba6ac51742ea64d989ab1d8b3b4633425bcd41'
     and 'b2521ddf7e798d79e5d8d18be1513bf0945cb051'
---

acfb7d8bb9d2c2d22232e75836d563f02c2aca6f