merge of '31da046f926a473ba6aab3543102759603fa6db9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 8 Sep 2006 11:39:44 +0000 (11:39 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 8 Sep 2006 11:39:44 +0000 (11:39 +0000)
     and '7fe7f8c6e5643a6104c91a6a3c5869d483a193aa'


Trivial merge