merge of 1ef406c4b198bad95e32551f7dbaf3d28aa7a399
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 5 Jul 2006 14:42:28 +0000 (14:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 14:42:28 +0000 (14:42 +0000)
     and ef6b7850cf49731311d3e212e89cd13208ee8d3e


Trivial merge