merge of '0b702cfd69c428d647fe3d50e3f95d0cd7faa70f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 6 Aug 2007 15:20:12 +0000 (15:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 6 Aug 2007 15:20:12 +0000 (15:20 +0000)
     and '7594ca77919f7a46379aa87be425a9ea26155e24'


Trivial merge