merge of '101e6eac19d0386458366b1121296ec77262c99b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 8 Aug 2007 08:42:00 +0000 (08:42 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 8 Aug 2007 08:42:00 +0000 (08:42 +0000)
     and '936655d78ffbdb4fb1988bbbeb66fb1f02670494'


Trivial merge