Merge commit 'origin/0.7' into 0.7 0.7 0.7@12288 0.7@12817 trunk@12817
authorroot <root@blitz.inria.fr>
Fri, 2 Jul 2010 15:42:17 +0000 (17:42 +0200)
committerroot <root@blitz.inria.fr>
Fri, 2 Jul 2010 15:42:17 +0000 (17:42 +0200)
commit629856dc0c8e0634ad282157eb68eda448010d84
tree1708e8f2e1c3dc43332b1f77a1a928eba38abcdf
parentf6a10cd9b823fc18abb9534453eb0fb53c22cf12
parent32c92cbaae712d7e0e19dc97dcd03a3c798b2b0e
Merge commit 'origin/0.7' into 0.7