From: Stéphane Jacob <sj@m4x.org>
Date: Mon, 20 Jul 2009 20:56:15 +0000 (+0200)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~313^2~7
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=43b816c7ed20f3b1dbb5c8b6971d8582016a7a86;hp=-c;p=platal.git

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

43b816c7ed20f3b1dbb5c8b6971d8582016a7a86