From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 31 Aug 2006 19:31:30 +0000 (+0000)
Subject: merge of 2994aa36c2fc770f17f1156ec1d07bb4890f2c1c
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e24a242bed0e893936f858d4750fbbea9a5861e8;p=openembedded.git

merge of 2994aa36c2fc770f17f1156ec1d07bb4890f2c1c
     and 3d0ac4552983da35d608db55f89a193257e5c32e
---

e24a242bed0e893936f858d4750fbbea9a5861e8