merge of 44e8475fbbcb9d102706a96d952948b2bdbfe12d
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 7 Sep 2005 09:49:49 +0000 (09:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 09:49:49 +0000 (09:49 +0000)
     and f1ee0327eee91259e262ed28b04a96ddf20d8b7c


Trivial merge