merge of '4f5beacbe7b1e42fd9aef1829880d4574a224107'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 12 Sep 2007 08:04:06 +0000 (08:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 12 Sep 2007 08:04:06 +0000 (08:04 +0000)
     and '858d3619107d3639eb7f4513780cd6c650e0741d'


Trivial merge