merge of 8285fffeea14ff0cd3878dcb884e0b5144db0c60
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Jun 2006 19:37:58 +0000 (19:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Jun 2006 19:37:58 +0000 (19:37 +0000)
     and 84e5771fb218fada8d3043b91b28f8300a52248c


Trivial merge