merge of '8c4d9d143b3386e8a9e062fd8917459f5b7958a2'
authorKoen Kooi <koen@openembedded.org>
Sun, 3 Dec 2006 22:24:34 +0000 (22:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 3 Dec 2006 22:24:34 +0000 (22:24 +0000)
commitaa0a41bb546c9e7acb587c23f49970c888c56f2b
treeb548af26f1f37775d126b20169b9a022b922d1c1
parent984a6d9b6cfac18cfad2a02dd30c450454d26b9b
parent3346e39d48ec06841f58bff4db62fe97973139b6
Merge ... '8c4d9d143b3386e8a9e062fd8917459f5b7958a2'
     and 'd6c00f5b34119df40f96e1c430057fead9087b1a'