Merge branch 'xorg/maint' into xorg/1.0.2/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 9 Dec 2010 21:31:43 +0000 (22:31 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 9 Dec 2010 21:31:43 +0000 (22:31 +0100)
commit4d9b63f8ec02d84eabd554234a32718758bf9e21
tree7f0180523f46918765ed16887c7fbec266045bf5
parent0fd9f2081fd8d3e6bff5b4d30d0ea71c47965053
parentc27bd93dd142ce81e44f9fdcf2a2e407f3176409
Merge branch 'xorg/maint' into xorg/1.0.2/master