merge of '627199fbe7856e67f8ca9485039c90a227b48598'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 2 Jul 2007 11:55:08 +0000 (11:55 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 2 Jul 2007 11:55:08 +0000 (11:55 +0000)
     and 'c26b01670f3bc8836f1ec27d0de85f3743d9d523'


Trivial merge