merge of 7ba73700ed732b698e688443c1f964454f76f1e8
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 8 Feb 2006 16:00:28 +0000 (16:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 16:00:28 +0000 (16:00 +0000)
     and e1e48e54eacd0f943b35dcc20e6b52674bcd69f9


Trivial merge