merge of '21c4008bb1561ef0bd0768e77c6048127fb19f77'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 10:40:57 +0000 (10:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 10:40:57 +0000 (10:40 +0000)
commit5c6cf455b79ed91b03ae9343218231aa3997175d
treed26f5eb887334f689d5dff2e45a1ac7886f5cd62
parent11f03716ee585ce7ffff95f6214701f618ef03e6
parent137d60c2555b1ce01a96a83433607649505f8fa6
Merge ... '21c4008bb1561ef0bd0768e77c6048127fb19f77'
     and '78239ce7f77a2301fe9e0775a684e0292dafaafe'