Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 28 Sep 2011 12:05:32 +0000 (14:05 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 28 Sep 2011 12:05:32 +0000 (14:05 +0200)
commitf9c42e979004e011b71856291d5f566393e27a09
tree4614f5170fbdd89edee4e5f7cfc4cadae2eb5ab0
parentfae4d62f4c1188f2a05253b1f3e6397a3a846eb9
parent0c1fd4d369059d8b6cada6615a8062321c1d5950
Merge with head