merge of c6c35eab9b22af441a0f6e66d80fbe9d2816a22c
authorRod Whitby <rod@whitby.id.au>
Mon, 31 Oct 2005 21:02:02 +0000 (21:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Oct 2005 21:02:02 +0000 (21:02 +0000)
     and c8f0cab0302c6c8cace2907ecc789e1a08db2dc9


Trivial merge