From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 17 Aug 2006 15:01:41 +0000 (+0000)
Subject: merge of 3afa4204843151e66efd20aa7c9a8f7145e29206
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~2^2^2~5^2^2~4^2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d946080c093d3be14294404b5ecfebfa4941cff;p=openembedded.git

merge of 3afa4204843151e66efd20aa7c9a8f7145e29206
     and 77a7289b4730d176a72d4d104b882642824bfda3
---

3d946080c093d3be14294404b5ecfebfa4941cff