From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 10 Aug 2005 19:31:25 +0000 (+0000)
Subject: merge of 90995c6a84b1333e5f3afd4db97b6790bd49ad14
X-Git-Tag: Release-2010-05/1~9453^2~3858^2~26^2~8^2~1^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aece2a6a2dea75deb69e8e93a436b0a356f51e6e;p=openembedded.git

merge of 90995c6a84b1333e5f3afd4db97b6790bd49ad14
     and 9736854d172591bb17c9228e6cb15b4fc9791c29
---

aece2a6a2dea75deb69e8e93a436b0a356f51e6e