merge of '1293c35f9186cb98ae4e1efe9e3cb8cc0e607def'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 3 Jul 2007 17:01:04 +0000 (17:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 3 Jul 2007 17:01:04 +0000 (17:01 +0000)
     and '799ba111ed9bf4dd2c65638fc75b6af788b54ab7'


Trivial merge