merge of '223327fd3033fa458005719c617ffb6c13746e86'
authorKoen Kooi <koen@openembedded.org>
Wed, 4 Oct 2006 13:23:00 +0000 (13:23 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 4 Oct 2006 13:23:00 +0000 (13:23 +0000)
commit844f7ef25e0634ed47e6e0a5f28ff9813a0518d8
treeaf3530d4f566b43d0c447bd8ccea2494d1e2e6b9
parent325b7da6a4b27df23d9874caf99376170abbe642
parent1f85d20eeb3a4eb0157d6da293cf5423d1515ef6
Merge ... '223327fd3033fa458005719c617ffb6c13746e86'
     and 'ce63e148eb0ac86cb7f827f18f543498d1950b15'