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)
commit46ca73eadbd598ee219bdc48724e14c8c08b40ef
treeb4748aadd83e5d4905ce139df5d333618a81ee5b
parent2ff892af1da9ebe78ef23159c8a01eb29122bd8d
parentbc2c60e709ab03541f6508b2b6871078270ff781
Merge remote-tracking branch 'origin/xorg/maint' into xorg/master