merge of '105955293719b2a1414f1b03af410b8ff8dbdb1b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Dec 2007 10:59:34 +0000 (10:59 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Dec 2007 10:59:34 +0000 (10:59 +0000)
     and 'c238596b6479864883292d3fa663a0cfd751e5a6'


Trivial merge