merge of '339d8c23276df48d5bd47404a5a8da2f987f0713'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 2 Aug 2007 14:48:21 +0000 (14:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 2 Aug 2007 14:48:21 +0000 (14:48 +0000)
commit589856652663573265fc023874c77fa0777a558b
tree0341f9738d90ddec297f65c3747595d0aadac138
parent03a2bf1262320feb4c292a3d76adddec808c605c
parentfda0855c35a6363404d3ea2e300cde32a5cffab3
Merge ... '339d8c23276df48d5bd47404a5a8da2f987f0713'
     and 'a280ff075699a8837095830f4f486c8493cead58'