Merge remote branch 'origin/xorg/maint' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 11 Oct 2011 20:38:14 +0000 (22:38 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 11 Oct 2011 20:38:14 +0000 (22:38 +0200)

Trivial merge