merge of '98b14503e47a28e2ea274f0efb9dca54e5ce4037'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 16:12:34 +0000 (16:12 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 16:12:34 +0000 (16:12 +0000)
     and 'd375e276dbe8f04f6a3fbcd1d61fea0eee345d32'


Trivial merge