merge of '7e947a0c90014aa35b2d54a97a35dac21ecd4545'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Oct 2008 17:23:42 +0000 (17:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Oct 2008 17:23:42 +0000 (17:23 +0000)
commit6f1aee10e349b087f8b3651222263fbff19c4876
tree69d528dada0190e72015c50525f3213156226aa2
parentf661ce424b1de1c942cf85769eb04c246a80c013
parent1b6ef61c219763169e638eeaa266f4e3572798bc
Merge ... '7e947a0c90014aa35b2d54a97a35dac21ecd4545'
     and 'ede2922a2a1c1c3eb84491c1cb019edc21f2729e'