merge of 589d63a12c5578567a811fa677ef36e878f4e6cb
authorRod Whitby <rod@whitby.id.au>
Sat, 30 Jul 2005 16:35:52 +0000 (16:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 16:35:52 +0000 (16:35 +0000)
     and d36e5c72767beb71b17b76d7875d6499de7372e2


Trivial merge