merge of '83560af206bd8bb934b62f0842171cd71f11387e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 16 Nov 2006 14:20:32 +0000 (14:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 16 Nov 2006 14:20:32 +0000 (14:20 +0000)
     and 'c4bb9c5cc658fec27d922fbfa89e108c32d4a842'


Trivial merge