From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 21 Dec 2006 18:02:15 +0000 (+0000)
Subject: merge of 3f6c5b018f885ff598481e717eb719514901f850
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dd79e54d1dc4c56aa9945e3ce4d2d3db5ed4e36;p=openembedded.git

merge of 3f6c5b018f885ff598481e717eb719514901f850
     and 42a911b9b7fa56ab93f59326d672e0facf4fa4f9
---

6dd79e54d1dc4c56aa9945e3ce4d2d3db5ed4e36