From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 8 Feb 2006 20:16:30 +0000 (+0000)
Subject: merge of 0877d014862bebd39f00cd33f5c60eafefbbc306
X-Git-Tag: Release-2010-05/1~9453^2~2382^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f699ef3604f2af3f321eeaa55d984d9421f83a10;p=openembedded.git

merge of 0877d014862bebd39f00cd33f5c60eafefbbc306
     and 66c4a96409f67476191a2635d4577125b7dafa40
---

f699ef3604f2af3f321eeaa55d984d9421f83a10