merge of '3961d9fa0932ee3f91d25b24350816ff1c3c7ff8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 11:11:46 +0000 (11:11 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 11:11:46 +0000 (11:11 +0000)
     and '91d610fe22ec5f30832680d42abf443bcd99fe6c'


Trivial merge