From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 30 Jul 2005 16:35:52 +0000 (+0000)
Subject: merge of 589d63a12c5578567a811fa677ef36e878f4e6cb
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a44d25351b7ed4ece60b04f2c79ea11f61cdcdaf;p=openembedded.git

merge of 589d63a12c5578567a811fa677ef36e878f4e6cb
     and d36e5c72767beb71b17b76d7875d6499de7372e2
---

a44d25351b7ed4ece60b04f2c79ea11f61cdcdaf