merge of '9f224874c5f8a4b528342f4a9ad8489d28b2a201'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 17:20:33 +0000 (17:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 17:20:33 +0000 (17:20 +0000)
commitb85c942cb6e147ce857cdc24af0f3aca2f4f0586
tree572e20585eb7a4bef5bac4ca96a29cecdfd92b35
parentb005e92be2bc359a1e8506339f2916bd92d48e0e
parentdda4b24a56b3eb979d3bd473044d5277a7296461
Merge ... '9f224874c5f8a4b528342f4a9ad8489d28b2a201'
     and 'c017d62785b5656a6d3deda474d3cdd5086c4c36'