merge of '3019a41b13454b8c73c07731830e179cef6cf1a1'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Nov 2006 21:46:26 +0000 (21:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Nov 2006 21:46:26 +0000 (21:46 +0000)
commit25eefa3fee344829c1201114cd8600da553293cf
tree6ec20d57e04e3da7f97a048ad46679db8cfb3db7
parentd5f68875343b7eb93ef9c614e52bd9966c06417a
parentc7c7c1c6f3d5c10e8887e1821e4d5bc02f6cb051
Merge ... '3019a41b13454b8c73c07731830e179cef6cf1a1'
     and 'fe5436e72a8ae2a8f3be6a00ae94615704cf38a1'