merge of 0b249bb9453266c79a3b51dcf685ec09b9d9f554
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Aug 2005 18:47:55 +0000 (18:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Aug 2005 18:47:55 +0000 (18:47 +0000)
     and a11947cce97bdb478f202cd3b80be4daa0e33a52


Trivial merge