Merge remote-tracking branch 'origin/xorg/maint' into xorg/master
authorFlorent Bruneau <florent.bruneau@intersec.com>
Tue, 22 Feb 2011 13:37:09 +0000 (14:37 +0100)
committerFlorent Bruneau <florent.bruneau@intersec.com>
Tue, 22 Feb 2011 13:37:09 +0000 (14:37 +0100)

Trivial merge