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

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

4f247453ac4a734953df893117b72168c60dd22e