merge of '6ecc6574ba0db38196a290448aaaf3706bcacee3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 5 Jul 2007 16:21:53 +0000 (16:21 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 5 Jul 2007 16:21:53 +0000 (16:21 +0000)
     and '7314baf01ff720449ddb034e256e260501df588f'


Trivial merge