merge of 8831508ad34817afd4114ca9c413c355bda57a0d
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 2 Feb 2006 14:58:08 +0000 (14:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Feb 2006 14:58:08 +0000 (14:58 +0000)
     and 976ab775c762724292479f9fa164027324d51b41


Trivial merge