merge of '69c4f23827bd5d45cfcc6008cf24a3877da4126e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 10 Jul 2007 11:20:53 +0000 (11:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 10 Jul 2007 11:20:53 +0000 (11:20 +0000)
     and '92f0750aade452d9021d2d2bd259d1b86edde5b5'


Trivial merge