merge of 001fcb061c24478ee6716a3e6160ebc3c9103b80
authorRod Whitby <rod@whitby.id.au>
Thu, 13 Apr 2006 23:29:22 +0000 (23:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Apr 2006 23:29:22 +0000 (23:29 +0000)
     and f627a8139e18a20e37bb4ad48de937eded7216f3


Trivial merge