merge of '043369f4d3f199290929731a9ad8b9be49e12a98'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 11 Jun 2007 16:36:07 +0000 (16:36 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 11 Jun 2007 16:36:07 +0000 (16:36 +0000)
     and 'bc21e707c3e812b35e2e6b7365ded989cae46f31'


Trivial merge