From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 9 Jul 2005 07:50:17 +0000 (+0000)
Subject: merge of 03133e2efc4b4ffe3f1544aca8171a7da90221f9
X-Git-Tag: Release-2010-05/1~9453^2~4206^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f16b7c8f5bfe23e1341158bbb14f74235c36a45c;p=openembedded.git

merge of 03133e2efc4b4ffe3f1544aca8171a7da90221f9
     and 7c7ad63dfa7e9cf84ed42393167d84da1f7c2030
---

f16b7c8f5bfe23e1341158bbb14f74235c36a45c