From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 20 Aug 2006 13:16:17 +0000 (+0000)
Subject: merge of 03732add4769957990129688c26e863118020e5e
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7294d4c17a8739a266d3a01adc4cb3596ba0194b;p=openembedded.git

merge of 03732add4769957990129688c26e863118020e5e
     and e50520839964c08c9cfd593b957f1efb58c951aa
---

7294d4c17a8739a266d3a01adc4cb3596ba0194b