merge of '871ce36219f0ef5feefc92c1e285f5771c0d1d6f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:21:55 +0000 (11:21 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:21:55 +0000 (11:21 +0000)
     and 'a2ba360575171f1e6eaf964368bd7edebd9ddecf'


Trivial merge