merge of '5a54ff951084840540d73015604fc8e7141bcf97'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 19 Dec 2006 10:47:29 +0000 (10:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 19 Dec 2006 10:47:29 +0000 (10:47 +0000)
     and '7077b8b2641ba9a4fac75665eab0c373aa3c2d48'


Trivial merge