merge of '68d786d826a65a1207a0d57228f667514ce0e74b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Nov 2006 08:59:10 +0000 (08:59 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Nov 2006 08:59:10 +0000 (08:59 +0000)
     and '9bffa04e210205375d9a75632e31368255316a3b'


Trivial merge