Merge branch 'xorg/maint' into xorg/1.0.2/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 16 Jan 2011 16:45:30 +0000 (17:45 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 16 Jan 2011 16:45:30 +0000 (17:45 +0100)

Trivial merge