merge of '5d703df48687b18de3beac73a0d364f47a49a736'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 31 Oct 2007 10:38:56 +0000 (10:38 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 31 Oct 2007 10:38:56 +0000 (10:38 +0000)
     and '9035f9a5f71e2ba479a0c67ef3e603dd91fe4cee'


Trivial merge