From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 11 Aug 2005 10:12:01 +0000 (+0000)
Subject: merge of 0bfafb15be028004cf9117bd99c73c9f7ee1b3c8
X-Git-Tag: Release-2010-05/1~9453^2~3858^2~26^2~8^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5db530540a094f96b52245c5896ef40009e6db6b;p=openembedded.git

merge of 0bfafb15be028004cf9117bd99c73c9f7ee1b3c8
     and 154b18293551ae7140a0552c72791f095d1f3f69
---

5db530540a094f96b52245c5896ef40009e6db6b