merge of '07ea9deeb7ff9046420d90b9ebec93c6f4210f67'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 14:09:08 +0000 (14:09 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 14:09:08 +0000 (14:09 +0000)
     and '3d864c3b4416d88fac29b7729fd8e83cd4b8aed2'


Trivial merge