merge of 'b44f4735776226776eff9f2c0c692f9658a207a8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 9 May 2007 11:32:44 +0000 (11:32 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 9 May 2007 11:32:44 +0000 (11:32 +0000)
     and 'f4394378e45366dc9b87bc34aa484175484485b2'


Trivial merge