Merge branch 'master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Fri, 13 Jun 2008 12:59:32 +0000 (14:59 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Fri, 13 Jun 2008 12:59:32 +0000 (14:59 +0200)
commit285596e4fdf65e9871c07bf33b6e674584868509
tree50e04e6783ae97fc06782618dab17af1711c13be
parent92b37ea34a8b1c7cf25280506d52108d9c0eff50
parente1ce18d25c473f31b4b6c167cd8ecc43b44a847e
Merge branch 'master' into hruid