Merge branch 'xorg/maint' into xorg/1.0.2/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 16 Jan 2011 16:45:30 +0000 (17:45 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 16 Jan 2011 16:45:30 +0000 (17:45 +0100)
commit164566891eef6e4027b2dfccda0040d37f10605b
tree4e2456f7483d4a59d563193c8ec31802fdbd01f5
parentfa671a304ea3cb2a63c688c0ae0539b33bdc679a
parent31ddf875617ffddbc713b7acfc5ab3c4711c5c09
Merge branch 'xorg/maint' into xorg/1.0.2/master