merge of '42c7569b1dc10cfed4aef02b04809e2247f3f535'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Sep 2007 06:18:24 +0000 (06:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Sep 2007 06:18:24 +0000 (06:18 +0000)
commit532e14617a3d39c0094bdd41531f90a4b6e2c596
tree3c22218c67cf7a7136bd721cf2fd70c7ec9ddd06
parentb48980825be61a2f95ad7ec5d4bf759f1ca3e815
parentf4db3713788397e03d3d41c417f55fa7bb7cb403
Merge ... '42c7569b1dc10cfed4aef02b04809e2247f3f535'
     and 'e0ffb9b29f40ba86057125fc2c1f717ffd362976'