merge of 10c72a538eb4e61277bcb8b38549768080f9039a
authorRod Whitby <rod@whitby.id.au>
Wed, 7 Dec 2005 00:02:20 +0000 (00:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Dec 2005 00:02:20 +0000 (00:02 +0000)
     and 79a998fb2cba55ee5a3451a77bcdc934c1ed2d8a


Trivial merge