merge of 5df1387cd8c625374e63d4615c0507cf6c6a45c0
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 15 Nov 2005 17:39:25 +0000 (17:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Nov 2005 17:39:25 +0000 (17:39 +0000)
     and 8a31a000a664d200e8aaa578c071fb1bf2664eb2


Trivial merge