merge of 'c1fd09a0b09739640d55402e3a267d14a39bfd80'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 18 Dec 2007 17:20:32 +0000 (17:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 18 Dec 2007 17:20:32 +0000 (17:20 +0000)
     and 'f32bd285f81d67ffe77c826a1f15be44ccefdc3b'


Trivial merge