From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 21 Mar 2010 16:09:54 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into account
X-Git-Tag: xorg/1.0.0~332^2~67
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=34465ab035104f739a54ec62660f04f874448627;p=platal.git

Merge remote branch 'origin/master' into account
---

34465ab035104f739a54ec62660f04f874448627