merge of 120e5d123e8915df8c4bcc5ba02bd1812a289f9b
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 7 Sep 2005 13:44:25 +0000 (13:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 13:44:25 +0000 (13:44 +0000)
     and a42933a87a04d4e2099d9d143673272d2a7ce1d2


Trivial merge