Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Fri, 26 Aug 2011 15:58:33 +0000 (17:58 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Fri, 26 Aug 2011 15:58:33 +0000 (17:58 +0200)
commit158ef6a512a64c25c66e2c5761ae0bde88a83608
tree2bf82b0fe3895b36de7f3097c9c8fde897a84249
parent6b8b1f6b5debff9f52ca7c47645cba4c54359313
parent0fde10bc88d6afc37a1c76cf49aa251b78300b7a
Merge with head