merge of '14cb91ca9bde319dd1a0b9521a6f7b44c8d5d462'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Dec 2006 13:02:22 +0000 (13:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Dec 2006 13:02:22 +0000 (13:02 +0000)
     and 'cb60d14273a3350c9c89ea8f8808936e25a46b3b'


Trivial merge