merge of 3ca788a65aef8d771564894175d04f8e315091fb
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 1 Sep 2005 10:19:35 +0000 (10:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Sep 2005 10:19:35 +0000 (10:19 +0000)
     and 6804be27b350307ccfcefb14f7d233e98556f408


Trivial merge