merge of '2d067cd21ac0062a769daf58cd58b0453c54c071'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 5 Dec 2007 18:57:01 +0000 (18:57 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 5 Dec 2007 18:57:01 +0000 (18:57 +0000)
commit68f2ebf8339eede85044102aec8cd575e147d387
tree90a4344173b345955f23d54501cc49c72c7486f9
parent808657f91112e147a7081af08e391945c544e081
parent9872af3e233a0bd282eb91a2e1b80dd7c4f7b8bd
Merge ... '2d067cd21ac0062a769daf58cd58b0453c54c071'
     and 'c2307b4d7d1657b17b06fcbfbc5612555e1f7a00'