From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 7 Dec 2005 00:02:20 +0000 (+0000)
Subject: merge of 10c72a538eb4e61277bcb8b38549768080f9039a
X-Git-Tag: Release-2010-05/1~9453^2~2967^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d22a25d432f1ff77cf4576dda8806ecb05c4bd71;p=openembedded.git

merge of 10c72a538eb4e61277bcb8b38549768080f9039a
     and 79a998fb2cba55ee5a3451a77bcdc934c1ed2d8a
---

d22a25d432f1ff77cf4576dda8806ecb05c4bd71