From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 26 Aug 2006 17:44:42 +0000 (+0000)
Subject: merge of '3e5c07282be03225713ccfe986e33b85e156fe00'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~59^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79fa061b76b9813588ce06d4b5cf64a70df29bce;p=openembedded.git

Merge ... '3e5c07282be03225713ccfe986e33b85e156fe00'
     and '6a4cba9a5f2d744231cc63907df52f0615c8d744'
---

79fa061b76b9813588ce06d4b5cf64a70df29bce