merge of '16141cfb7ddd939f1759a94546b737b35c0ece43'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 10:17:57 +0000 (10:17 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 10:17:57 +0000 (10:17 +0000)
commit137d60c2555b1ce01a96a83433607649505f8fa6
tree8729b3cc4db624eb487f1da367948bc8562d50b2
parent4e96c29dc9b9ea5f6652ed63bcfd82d912ab41b8
parentc3be2a552db104291accd82b2e674d31d5527fcc
Merge ... '16141cfb7ddd939f1759a94546b737b35c0ece43'
     and '70cf6fac1508deeecfecf766f0b26020893dc6d3'