merge of 7407af57a0190a57119bdc083f162292bfc7e411
authorRod Whitby <rod@whitby.id.au>
Tue, 25 Apr 2006 20:40:50 +0000 (20:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 20:40:50 +0000 (20:40 +0000)
     and c032f363b900b2e705a80a784c2bd7eb7c7d6549


Trivial merge