merge of '0b702cfd69c428d647fe3d50e3f95d0cd7faa70f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 6 Aug 2007 15:20:12 +0000 (15:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 6 Aug 2007 15:20:12 +0000 (15:20 +0000)
commit8b5e11c2bafe4f22848b24b8d96df02bf23849be
tree4e0212e4cdefce6b29275af247ad82e1177d840f
parent073a4b33442d36b178883d3315b0ad0bdc36d124
parentd35d6c7918a7fb272b085a3290e9389f80ab0e0d
Merge ... '0b702cfd69c428d647fe3d50e3f95d0cd7faa70f'
     and '7594ca77919f7a46379aa87be425a9ea26155e24'