From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 9 Aug 2005 18:08:17 +0000 (+0000)
Subject: merge of 681b8acdebf4ff7e7427274b9d5859a0cfb5230c
X-Git-Tag: Release-2010-05/1~9453^2~3920^2~22
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c701704d029a1de8698a481c2de814ed4ecb252;p=openembedded.git

merge of 681b8acdebf4ff7e7427274b9d5859a0cfb5230c
     and bb0acdc6b3b3e3a264209a9f0094212e7f83e31a
---

4c701704d029a1de8698a481c2de814ed4ecb252