merge of '25bb53fbf963dd3caa035a35812ce4e881aaf682'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 13:47:22 +0000 (13:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 13:47:22 +0000 (13:47 +0000)
     and '357d97e86b9fe8fce1d432f4c1abcd5d56b0107c'


Trivial merge