Merge remote-tracking branch 'origin/xorg/maint' into xorg/master
authorFlorent Bruneau <florent.bruneau@intersec.com>
Wed, 23 Feb 2011 19:33:19 +0000 (20:33 +0100)
committerFlorent Bruneau <florent.bruneau@intersec.com>
Wed, 23 Feb 2011 19:33:19 +0000 (20:33 +0100)

Trivial merge