Merge remote branch 'origin/master' into xnet_accounts
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 11 Aug 2010 15:10:13 +0000 (17:10 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 11 Aug 2010 15:10:13 +0000 (17:10 +0200)

Trivial merge