merge of cf227662bf5075a64cb22a8e517fa3a4ed9a6b45
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 28 Jul 2005 11:32:16 +0000 (11:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 11:32:16 +0000 (11:32 +0000)
     and e34e002afa05c5fa5be23cd743d8ca5ad2d2b90b


Trivial merge