merge of 69a16876f0ffb0c103caef0590521a09a27ea04f
authorRod Whitby <rod@whitby.id.au>
Fri, 13 Jan 2006 17:05:32 +0000 (17:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 17:05:32 +0000 (17:05 +0000)
     and 727e147b943bf50bd25b6a42f0d8d51dfd7ba82e


Trivial merge