merge of 6fca06e20d50764f7e51708275124a30ef3b8500
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 31 Oct 2005 21:05:47 +0000 (21:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Oct 2005 21:05:47 +0000 (21:05 +0000)
     and c6c35eab9b22af441a0f6e66d80fbe9d2816a22c


Trivial merge