From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 2 Jan 2011 20:08:54 +0000 (+0100)
Subject: Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
X-Git-Tag: xorg/1.1.0~242
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=77de31c98f05be58870afbaa0cb6ba9f6cbb1799;p=platal.git

Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
---

77de31c98f05be58870afbaa0cb6ba9f6cbb1799