merge of 153be4736bf674fd8330fb369cf0a2a6ad382473
authorJonathan McDowell <noodles@earth.li>
Tue, 8 Nov 2005 08:53:57 +0000 (08:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Nov 2005 08:53:57 +0000 (08:53 +0000)
     and 839ec3f42960c632240a938d522021359a9c136d


Trivial merge