merge of 3c029d760d1bb441a3632db0b6ea12f2d8a5ad37
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Aug 2005 15:04:58 +0000 (15:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Aug 2005 15:04:58 +0000 (15:04 +0000)
     and 4fb612f89bbeeff34ce6d9b152b2d8e73b86d009


Trivial merge