merge of 2819920094dca747f14618a39af7015cd0241b2d
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 24 Aug 2005 08:52:41 +0000 (08:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Aug 2005 08:52:41 +0000 (08:52 +0000)
     and e8bfb35af8540286b11cb144ba084ec2bf8baf71


Trivial merge