merge of '5968fdd70fe297abea7dae6b5ada03014e1c4e37'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 19 Dec 2007 04:38:07 +0000 (04:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 19 Dec 2007 04:38:07 +0000 (04:38 +0000)
commit0ae7ffe431b852bf52424f72a608cc4b0b00e608
tree31a29cc681def6156ac56f32aed5b4145ecfaa3d
parent6fab39b44dfe4abb7a68197d9eb5387190462b06
parentb1a282eefccb30efaff4877307aa09506fe19297
Merge ... '5968fdd70fe297abea7dae6b5ada03014e1c4e37'
     and 'c2b6ec6ab4d7fe9e98eeb4ab4762cdb5da714774'