merge of '5259dfab416d5f0ea53cc4ad85ec7445cd760e9c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 11 Jun 2007 15:36:16 +0000 (15:36 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 11 Jun 2007 15:36:16 +0000 (15:36 +0000)
commit6caeef88930fef812e6a8a3dc4bb344babad39a0
tree765fa058cd05ce504e6cb78390c7fabfd728b6ed
parentc95e380a833881cc95ffe07dbb08536f7c4d4cb1
parent738ae752fddd9c28a22ac7c7a4f7299a6bc388a9
Merge ... '5259dfab416d5f0ea53cc4ad85ec7445cd760e9c'
     and 'f8984ff1139f0fee1957bc41b210b2b92b40b6a4'