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

merge of 454b45d15e13c588f56710d40bad974b84f2d8ce
     and 69b3134a4a162cdd3e926b6229c0b8bcd01062f9
---

dd4362cf4877505ee55f8fdc800cc5f410a66a11