Merge branch 'xorg/maint' into xorg/1.0.2/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 9 Dec 2010 21:31:43 +0000 (22:31 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 9 Dec 2010 21:31:43 +0000 (22:31 +0100)

Trivial merge