merge of 08771dbdc0003bc7f360b06dc077cb8a8205a699
authorRod Whitby <rod@whitby.id.au>
Tue, 24 Jan 2006 20:30:23 +0000 (20:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 24 Jan 2006 20:30:23 +0000 (20:30 +0000)
     and 118e8965704196e1da0de17beb55e9816f7b3c89


Trivial merge