merge of '4c707078f812ad92fe59bccdba4b732c19d86f58'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 13:32:31 +0000 (13:32 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 13:32:31 +0000 (13:32 +0000)
commit04fc97c66f0a23f348dde70d0181d1661a80a13c
treef2d3c04ce97de5f0e6050a957826d70b4a2c84e4
parent39b7763dc0bd65afb1e40cc66478a4df2b319fe4
parent4c47fc67d88ca30bc14d80a05b14f65c06504ea0
Merge ... '4c707078f812ad92fe59bccdba4b732c19d86f58'
     and 'b7b67f6048fe2a820cabbf8ef59a12d38cd266dc'