merge of '4ab3710b70f820537b311ab17eff50c0c82a07a2'
authorKoen Kooi <koen@openembedded.org>
Wed, 18 Apr 2007 21:06:14 +0000 (21:06 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 18 Apr 2007 21:06:14 +0000 (21:06 +0000)
commitd003671f7013dd70860e9a8e4ab1414676439461
treefc893c9345bed136928777a521eea0935014e436
parentd04f1db6760a48a88a7ceb95fc61ebd88d257fd9
parentac1f56acc1b2aa9819927ac52d697bc8baeadf90
Merge ... '4ab3710b70f820537b311ab17eff50c0c82a07a2'
     and 'af9abf7faf7bb6268429bba6d7fcc41eed8b8a69'