merge of '17c261d19b8358762e0eb5cbbc9a4cc29c9e63bc'
authorKoen Kooi <koen@openembedded.org>
Thu, 7 Dec 2006 12:52:33 +0000 (12:52 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 7 Dec 2006 12:52:33 +0000 (12:52 +0000)
commit2bb7a436dd2785f792947d5d815249688901ea03
treeaf13fff1711bf912d32fafeb688b32088529a314
parentf65fee04072bbe221d017621e19ae04e393a8b7f
parente42053805cacfddf2e404aad0d3324e84972b954
Merge ... '17c261d19b8358762e0eb5cbbc9a4cc29c9e63bc'
     and '7c038075995ee701b14136f3a37c2f0635040891'