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

merge of 0b5f03e97ed5901958ca1433116e4396100ed741
     and 3b73d8936075bedc6e8e8c75ad408d3e5048a832
---

f92150b31c6a8a8306d365af6e2ce46104b1128d