merge of 2c175103edd16989707cafa26c364d4c836c78f1
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 6 Jul 2005 09:31:04 +0000 (09:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 6 Jul 2005 09:31:04 +0000 (09:31 +0000)
     and 6ce955f2f98c52e7f840a56e77bc39b232bd4b16


Trivial merge