merge of 4971c75b1b9a6e41c9989e488a272d42ceae8635
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 16 Sep 2005 14:59:47 +0000 (14:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Sep 2005 14:59:47 +0000 (14:59 +0000)
     and ea88a8d55da2833e15e73c91f4de3eac149f715c


Trivial merge