Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 28 Feb 2012 18:58:57 +0000 (19:58 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 28 Feb 2012 18:58:57 +0000 (19:58 +0100)
commit04255538dbacfa52a45e8439b9c9ea590a82dc47
treeb2c2dc2f31b1573b7540a9cf43a9226b31412513
parentf7f57707d12dd626d4293dc1e34451fc23763052
parent35b6e6e9d7f65943b6016e9595e5dc6bb777d634
Merge branch 'upstreammaster'