Merge branch 'account'
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Tue, 23 Mar 2010 10:54:29 +0000 (11:54 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Tue, 23 Mar 2010 10:54:29 +0000 (11:54 +0100)

Trivial merge