From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 20 Dec 2006 14:17:32 +0000 (+0000)
Subject: merge of 0bd27d7132e889a225218f2ac437ba4845588f95
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d00ef4835ac5376e07dca67f78b27e9e0365485b;p=openembedded.git

merge of 0bd27d7132e889a225218f2ac437ba4845588f95
     and 919443611fa953ccf488cdb69b7f7c21b5b2edda
---

d00ef4835ac5376e07dca67f78b27e9e0365485b