merge of '171c5d74e25e7c161bf23648620a923e90cfcc5b'
authorKoen Kooi <koen@openembedded.org>
Fri, 11 Jan 2008 07:31:27 +0000 (07:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 11 Jan 2008 07:31:27 +0000 (07:31 +0000)
commitdfbc34973c10aacdacb78950099ba4e105b002ef
treec3530e8b070fc2ec9ae814082288b5f1af06caf1
parentf4f969a659645ac0ad184f1959f9213e0ae8be53
parent71af0a1d87aa6dc219b6b7019e4314d8a07e7bdc
Merge ... '171c5d74e25e7c161bf23648620a923e90cfcc5b'
     and 'e52ff8ea262ab9963525b0a0f6ac0f631d53e597'