merge of '3332520bb8031e881dcdc1cb97820a8d4e479e76'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Mar 2007 18:02:02 +0000 (18:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Mar 2007 18:02:02 +0000 (18:02 +0000)
commitb693f3601b15385a806ee6eee969e2e1e944639b
tree4157b4998d9074e92918de56c1cc239522e0f948
parent09b18d1fff43cef84dcaa8fa0723f0e38b92d5d1
parentb566a6e647b2c769a2e3c431ab7d76727bc77243
Merge ... '3332520bb8031e881dcdc1cb97820a8d4e479e76'
     and '4098a08f55f40b0de343d3a1948293be774ea37e'