Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 14 Sep 2011 04:57:40 +0000 (06:57 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 14 Sep 2011 04:57:40 +0000 (06:57 +0200)
commit0c908df356a6e40f6a3d69c46b5a14afc24df62b
tree6416dfd4daa39652ea4790f9b23bb0af013a71b7
parent0cb307b5509ef1dbc4ec05998a33ddb9232f5006
parent7ba1f1c912766fa0b9c5227418ec9fa1fa7f8b4e
Merge with head