Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 21 Jan 2011 19:36:28 +0000 (20:36 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 21 Jan 2011 19:36:28 +0000 (20:36 +0100)
commit020a95fa78dc544b3064739d409026a0056d98f4
treeaf9660c01ab7be4d0ca7598d6b24dc838a93361a
parentb7bad73e2388cb40d224a3a0cbdff68335800b90
parent806dd8b8c322e0175cdcb483b38818e8b8ae4a02
Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master