merge of '5a54ff951084840540d73015604fc8e7141bcf97'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 19 Dec 2006 10:47:29 +0000 (10:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 19 Dec 2006 10:47:29 +0000 (10:47 +0000)
commit13bbe27a5031c4df0f9cdabff5ace5046667254e
treea975f65c8cf7bafc70cc50240a3371afbe321d22
parent19dec673258e20633d472ef5f8d8c34e893d9146
parentac9e340b0be16a855374c55e90c08c9e78f27b60
Merge ... '5a54ff951084840540d73015604fc8e7141bcf97'
     and '7077b8b2641ba9a4fac75665eab0c373aa3c2d48'