merge -r 411
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Wed, 17 Aug 2011 16:09:25 +0000 (18:09 +0200)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Wed, 17 Aug 2011 16:09:25 +0000 (18:09 +0200)
commit5fe61fe6d656d4f21b5e8811ef25f3a1613868d4
treea0ffddc3d0bbe18871c1d5e9d8608401c06c11bd
parent4543724bb61b32df4fb9486e18e1e51a62d8cf98
parentdcba168163dadce7a974d55acd73a7bf810a98f0
merge -r 411