merge of 2b1505a49c1d0539fe1fd18e82311947011facb7
authorRod Whitby <rod@whitby.id.au>
Sat, 5 Nov 2005 21:33:43 +0000 (21:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 5 Nov 2005 21:33:43 +0000 (21:33 +0000)
     and f7112800b1c3c07c41c1b8bc8840029091ce846c


Trivial merge