From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Fri, 9 Sep 2011 22:35:10 +0000 (+0200)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.3~2
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=173ff0bdf41db90ee0995e0c3bf844bf2151d0e6;p=platal.git

Merge branch 'xorg/maint' into xorg/master
---

173ff0bdf41db90ee0995e0c3bf844bf2151d0e6