merge of '9551a443b67af5912951314c6eae39950acd1ba3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 11:56:15 +0000 (11:56 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 11:56:15 +0000 (11:56 +0000)
commit817437fba213796c53265e2110c9d0abab9d69fc
tree3c3c58ba7035d36bd11f5d6e128047549cb6603a
parent6c9f027f7955baf8bb1b4c62223b3cb789d5ffaf
parent4159e3aa7dcf9b7343939547c3ba5c014e7641fd
Merge ... '9551a443b67af5912951314c6eae39950acd1ba3'
     and 'e8ff77e628da5642375fa3f67e93d66d5418ffa6'