merge of '8ed5d1634e5cf85d56285543499643908effdede'
authorKoen Kooi <koen@openembedded.org>
Thu, 14 Dec 2006 11:10:15 +0000 (11:10 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 14 Dec 2006 11:10:15 +0000 (11:10 +0000)
commitf5123b32f92d24104c325b090bf18f0e82ad087f
tree9c996cd711e9aa0eca6780e6e88b0b11a6ef202e
parentb5eb10e8d0be925c071fb1cf5df54bd07810ce42
parent89e621d39fe0d6c770f3f5ce868ea81db90f5a3a
Merge ... '8ed5d1634e5cf85d56285543499643908effdede'
     and 'a98e06eb29c0d8f228038acbaf2a660ea5c43fc6'