From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 7 Feb 2009 00:21:18 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~344^2~24
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=a0ad593aec01fe6387ee83f3ef487bcdc3c3c5bd;p=platal.git

Merge commit 'origin/master' into fusionax
---

a0ad593aec01fe6387ee83f3ef487bcdc3c3c5bd