merge of 'b3a66a0251c3a47228fa0f4ce4cdc78856bb70f3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 30 Oct 2007 15:23:36 +0000 (15:23 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 30 Oct 2007 15:23:36 +0000 (15:23 +0000)
     and 'b98d57aa4b2e59e402bec4959253416a68cbf4a2'


Trivial merge