From: Vincent Zanotti <vincent.zanotti@m4x.org>
Date: Fri, 13 Nov 2009 23:21:02 +0000 (+0100)
Subject: Merge branch 'master' into account
X-Git-Tag: xorg/1.0.0~332^2~311
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=353f2d2b11c4e3c6c0bc3553813368b6f42fa9c6;p=platal.git

Merge branch 'master' into account
---

353f2d2b11c4e3c6c0bc3553813368b6f42fa9c6