Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 16 Jan 2012 14:21:17 +0000 (15:21 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 16 Jan 2012 14:21:17 +0000 (15:21 +0100)
commitf7f57707d12dd626d4293dc1e34451fc23763052
treea74376c015bd12fec571aab3fe57ef869710ca6a
parente97e0020b0b054e3a340928538e4a2748ea65efc
parente4f1dd6dacd221fec502d22971c2433e530c8af1
Merge branch 'upstreammaster'