merge of '70e5cb5b57b8b8e92379709529ff8e0b02dd4f35'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 02:10:40 +0000 (02:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 02:10:40 +0000 (02:10 +0000)
commit415fd7ba4f37b2a16edc95e84ef95560e42ac125
treec386b3ce1e706439256282bf941406ff3da8a2d3
parent68446fb9940af94c377b2552a45d12d5e3e542e2
parentacc72608c0dacf8b3f4aa67b1ec1f513c67ccce5
Merge ... '70e5cb5b57b8b8e92379709529ff8e0b02dd4f35'
     and 'd8d258ba37698b02258816d08d8b88b5fa957d23'