merge of 4264a3481fbafe5152b995ab34011c0af9c1461d
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 19 Dec 2005 15:01:22 +0000 (15:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Dec 2005 15:01:22 +0000 (15:01 +0000)
     and 762f4d12a37a7cd4021c1834caced97ae950c13d


Trivial merge