merge of db90e0deb7a031c29d263ee783179a2f9a00c649
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 10:18:59 +0000 (10:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 10:18:59 +0000 (10:18 +0000)
     and a07719feb319fd43615902b86aa7a10c6b61d0ba


Trivial merge