merge of '6751c33f46b4e65f3b35180979c5046f64ffb938'
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Jun 2007 10:36:49 +0000 (10:36 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 21 Jun 2007 10:36:49 +0000 (10:36 +0000)
commit4f6d90f7352a2ddbf660afcf9803942cc74f084d
tree6da823b6685601c8cb94dd7a981e1b5897f318c5
parent236047df425af9f1b51bd9362b840b1f5c388e89
parentbccc9c404d2efcdbd0e4d671de11e5efd6b3aae3
Merge ... '6751c33f46b4e65f3b35180979c5046f64ffb938'
     and 'f5d5ad96ac7c6449a62ad6a934afb8a2659519ed'