Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Sat, 1 Oct 2011 18:26:31 +0000 (20:26 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Sat, 1 Oct 2011 18:26:31 +0000 (20:26 +0200)
commitebf1d345f968a170014f27e37038d9e6b6fea014
tree7bedafb6b19dcfea8965817208778ca2bef6202d
parent25e6a5302a61952a16b13c45fce29d9c696e9018
parentd9ce11c5bf7258564806622601d4120f4f3721ac
Merge with head