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)
commitff6db4227501fef91b4fc414b85b5f547e677247
treeb5570be09e1181b6f1f4f5a694c27ee894643f17
parenta43e2b53a23bbd6955209a01a8388508f9205857
parenteef6f1d950d0772086452937e5cd11e21b303686
Merge ... 'b3a66a0251c3a47228fa0f4ce4cdc78856bb70f3'
     and 'b98d57aa4b2e59e402bec4959253416a68cbf4a2'