From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 31 Aug 2006 12:16:16 +0000 (+0000)
Subject: merge of cfd9ad7a92cec8e6bd5033ff5f9da8347c96ef80
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1^2^2^2~1^2^2~1^2^2^2^2~5^2~1^2^2~1^2^2~2^2~1^2^2^2^2~1^2~2^2^2~1^2^2^2^2~1^2~2^2^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d17c8cb252e69ef9874244c4586c4ce9b3c197e1;p=openembedded.git

merge of cfd9ad7a92cec8e6bd5033ff5f9da8347c96ef80
     and e16e6a228ba05836f11e6096da8531c66005dd42
---

d17c8cb252e69ef9874244c4586c4ce9b3c197e1