merge of '6e9430a4e782e0542e8046eb8950843c594a3fc0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 12:27:56 +0000 (12:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 12:27:56 +0000 (12:27 +0000)
     and '9ebfa26d1a834b3ee52ebbb836458089347632e3'


Trivial merge