merge of '2f655855e9cd21f0db11577a04d65162273a4b1c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 12:30:36 +0000 (12:30 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 12:30:36 +0000 (12:30 +0000)
     and '7754c88af17176a35aedbbe47eeab2d9d5d7774b'


Trivial merge