merge of '6794aa0dd1ca646be71cc57651a883ac99f55985'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 11 Jan 2008 08:37:43 +0000 (08:37 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 11 Jan 2008 08:37:43 +0000 (08:37 +0000)
     and '7775497ff0c2687b47560d82fd34535a0952beac'


Trivial merge