Merge remote-tracking branch 'origin/xorg/maint' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 17 Jun 2013 07:53:51 +0000 (09:53 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 17 Jun 2013 07:53:51 +0000 (09:53 +0200)

Trivial merge