merge of '1669749c4615b77d79a8df668ac9ce91730cf77a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 22:10:04 +0000 (22:10 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 22:10:04 +0000 (22:10 +0000)
commit984a6d9b6cfac18cfad2a02dd30c450454d26b9b
treed4048675f433a77dcebaa681dfd34ec9e8661aa7
parent7888961f89f8bd1cda71da31f99d967c76f56ad5
parentf3d5620b4031f58f0f6fedf409cae207d76aff92
Merge ... '1669749c4615b77d79a8df668ac9ce91730cf77a'
     and '8f25eeb3d52cd94924df16c4c1790609c547ff6a'