merge of '39f14a7904df78c33a10ff78c5b16684b63bf4ca'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Oct 2007 20:35:04 +0000 (20:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Oct 2007 20:35:04 +0000 (20:35 +0000)
commitb53788c8e24cd26c4ff66b8f78f7e4229b766b72
tree9bca51d8ed92d987f6c4b90dc6e9d7ae5c3b4d20
parent45766485451172ec01fe5fac0ba66844b0c3c088
parent5b1d255b2a81ccb632a047dd360cc34c8ae85e94
Merge ... '39f14a7904df78c33a10ff78c5b16684b63bf4ca'
     and 'ff99dd15b2922519885cf8632ba157d543e933c2'