merge of '00d78946cd1515dee27466d89f128fdb53cca857'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 13:39:31 +0000 (13:39 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 13:39:31 +0000 (13:39 +0000)
     and 'ef1a4a2342c9bd1b81be3adf9d3bf41a56e6aacd'


Trivial merge