merge of 'b2043e7a059106dce11b80a41022ab9a738027e4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 19:18:16 +0000 (19:18 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 19:18:16 +0000 (19:18 +0000)
     and 'f45f0798cde6df6f34666e284a5ebf02d788477a'


Trivial merge