merge of 444d1a1c1d3bc630ab21c03a79787f3d2351a40b
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 7 Sep 2005 13:27:46 +0000 (13:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 13:27:46 +0000 (13:27 +0000)
     and dac5598f960dc940e35412e5c4235baf09f4afbf


Trivial merge