Merge branch 'alchemy'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 4 Mar 2012 15:23:58 +0000 (16:23 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 4 Mar 2012 15:23:58 +0000 (16:23 +0100)

Trivial merge