From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 19 Dec 2006 09:07:35 +0000 (+0000)
Subject: merge of 6e6bbf559d74bca5da6958e8eca66e94b5d8248b
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~6^2^2~1^2^2^2^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4c5c296104697026b4d1891a4c1bc7ae1f801ee;p=openembedded.git

merge of 6e6bbf559d74bca5da6958e8eca66e94b5d8248b
     and 873e9c1c022896459e35caf07ff1569d30bcead0
---

f4c5c296104697026b4d1891a4c1bc7ae1f801ee