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)
     and 'c2307b4d7d1657b17b06fcbfbc5612555e1f7a00'


Trivial merge