merge of 43ac6cf3fe43c95b123d6d6cef025463fe86d845
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Oct 2005 16:51:15 +0000 (16:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Oct 2005 16:51:15 +0000 (16:51 +0000)
     and b06f0e15131ef6e08f949289a0b2ff18f8d0dab5


Trivial merge