merge of '75f97628b011932079037cb5e552c4a16fb02a02'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 11 Oct 2006 12:54:28 +0000 (12:54 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 11 Oct 2006 12:54:28 +0000 (12:54 +0000)
commit9e0813c92b0cf22571e01b9145895bab99b22911
tree28aa904768ea9b9745ddaf3d145ff52f82793ff6
parent4b6fd4c6ed37589a45f8f3a394b9031022636d3e
parent41675b96250b3b40a20bfe56c68d184bfd046a93
Merge ... '75f97628b011932079037cb5e552c4a16fb02a02'
     and 'acbcf196742b1924b6aad15971f926d940604308'