Merge remote-tracking branch 'origin/xorg/maint' into xorg/master
authorFlorent Bruneau <florent.bruneau@intersec.com>
Wed, 23 Feb 2011 19:33:19 +0000 (20:33 +0100)
committerFlorent Bruneau <florent.bruneau@intersec.com>
Wed, 23 Feb 2011 19:33:19 +0000 (20:33 +0100)
commitc2b36eadda10e7e4245013a88073e751e811a403
tree2ec6213efaa2a8bfb9f933b13ad816f0b2e319c3
parenteecde6a3495273124c2450514554fa6c0250521c
parent91b9255bf67fa0f9d7093a9930d20a5327972270
Merge remote-tracking branch 'origin/xorg/maint' into xorg/master