Merge remote-tracking branch 'origin/xorg/maint' into xorg/master
authorFlorent Bruneau <florent.bruneau@intersec.com>
Sun, 27 Mar 2011 14:33:39 +0000 (16:33 +0200)
committerFlorent Bruneau <florent.bruneau@intersec.com>
Sun, 27 Mar 2011 14:33:39 +0000 (16:33 +0200)

Trivial merge