merge of '43591068998de05cfdac737237e45e3cd0260ea3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 8 Nov 2007 11:38:40 +0000 (11:38 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 8 Nov 2007 11:38:40 +0000 (11:38 +0000)
commitf1edd8991f16eb0305bdd301f5bc73e7f177cebd
treedc359c7fb6bbe14f7c86147b05b14ced9c687642
parent1f7343079a1b56e623aba7fdf63946f3dae979e3
parent0ba32a9395ec0b11d92ba82664a9598c488ec28f
Merge ... '43591068998de05cfdac737237e45e3cd0260ea3'
     and 'd1a492aecc2679b803ca6d8013a5391c4a281f9f'