merge of 0b5d6ed48b6bbd6c6c562be67f6b8f51f55433c0
authorRod Whitby <rod@whitby.id.au>
Thu, 13 Apr 2006 19:36:24 +0000 (19:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Apr 2006 19:36:24 +0000 (19:36 +0000)
     and cf432acec69f2b77b5f85cd8f610464a164f2251


Trivial merge