Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 4 Oct 2011 07:30:12 +0000 (09:30 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 4 Oct 2011 07:30:12 +0000 (09:30 +0200)
commita8a1bac1a198493cced1a0773eaffde6c361363c
tree249752943ed282e36a6b4c3b9c326c968dd962a8
parentc0244235740013c6be589da245f1c6e427dda9b9
parent5d50cf2cc49611daf986afc0e2833607cc6ab411
Merge with head