merge of '1944e442d97092991784475bf4b8980e60c5c3fc'
authorKoen Kooi <koen@openembedded.org>
Tue, 2 Jan 2007 19:31:02 +0000 (19:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 2 Jan 2007 19:31:02 +0000 (19:31 +0000)
commit4cfc3d5ccd4cd3dc572958bdad127856be41cb2c
treeec1017dd159196314b0c49e2e4586a5eb4b148f9
parent9f9094de71fc15decea442de3aebfdfec3b600ad
parent68efee7f26b15d2c3bab3fb7f807c5853ca6da77
Merge ... '1944e442d97092991784475bf4b8980e60c5c3fc'
     and 'c6043a6be9941ce6182b30748b51b8f191e04bc8'