merge of da6affcdbf0208b7dfea0a8524ab5c6b2a6b2439
authorRod Whitby <rod@whitby.id.au>
Tue, 2 Aug 2005 01:01:27 +0000 (01:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 01:01:27 +0000 (01:01 +0000)
     and e7290af9d0e9df3b27cb4b84e356083c3df2231e


Trivial merge