merge of 1b045e2618ad7f952f27e25154f22e90e12f88e0
authorRod Whitby <rod@whitby.id.au>
Tue, 11 Apr 2006 04:38:01 +0000 (04:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Apr 2006 04:38:01 +0000 (04:38 +0000)
     and ec65eb2425626b59f384f8ab081929e9a4f8c5b4


Trivial merge