merge of '2cb5af15b69e039f3a37629ca3a637b05cae7138'
authorKoen Kooi <koen@openembedded.org>
Tue, 2 Jan 2007 19:39:48 +0000 (19:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 2 Jan 2007 19:39:48 +0000 (19:39 +0000)
commit26923fcad450090e65e0fca74a0532fbea3ae458
treeec1017dd159196314b0c49e2e4586a5eb4b148f9
parent1c0f065147987103a23908fcdc954834df3dad5f
parent4cfc3d5ccd4cd3dc572958bdad127856be41cb2c
Merge ... '2cb5af15b69e039f3a37629ca3a637b05cae7138'
     and '8571d11847894fe4e419cfb25c5ae5accc13e3aa'