merge of '7d5c4e9e02ee9f5067a674b75bf7163b0b89b564'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 14 Dec 2006 16:32:34 +0000 (16:32 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 14 Dec 2006 16:32:34 +0000 (16:32 +0000)
     and 'd53336ad58d99d6f07bd94fd6bf31fe2dc1c8d24'


Trivial merge