merge of '91e857f4e4f0139bbea26d8f79434e22885acf30'
authorKoen Kooi <koen@openembedded.org>
Wed, 18 Oct 2006 08:49:53 +0000 (08:49 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 18 Oct 2006 08:49:53 +0000 (08:49 +0000)
commitf680f934863dd0f4f673cf2f54efd61ccb40c270
treedfec89604e146ebe319615304b8895b82053d819
parentb4ceff69dc72ecb32acf104154524731748fca23
parent87efb189a8e813c7f4346442c8a49f160744e2e4
Merge ... '91e857f4e4f0139bbea26d8f79434e22885acf30'
     and 'c4b26d4a928a1fca0cf7295a0c9ce96e4e9d04ba'