merge of '80b03b9b2ade5007c82ff741d46a20be8538e263'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 4 Jun 2007 15:30:18 +0000 (15:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 4 Jun 2007 15:30:18 +0000 (15:30 +0000)
commite2b1a5a3beae593063df2b34e409e4f66e12b710
tree9873c9565b702055653472f37ef60082790180a7
parentb29e92b49e7582d9aab36dce6cdb8be8e8e5ba10
parentd6e4f91ac5743dc0a1c324797ad8629f69daffa4
Merge ... '80b03b9b2ade5007c82ff741d46a20be8538e263'
     and 'f4c8ae3396278e2cdf79e100dca4845cca94c5d1'