Merge remote branch 'origin/xorg/maint' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 11 Oct 2011 20:38:14 +0000 (22:38 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 11 Oct 2011 20:38:14 +0000 (22:38 +0200)
commit5289c142e04219cb8e846c86ccd9f5005d7d49e1
tree70e8aa85f8fa9e89ebfee838627d02007c13b1f2
parent44d239f67b4724c92abdec680c8cd31ac9e36649
parentecd28ce878b37c7f0e8d027679ea22d00c1426f4
Merge remote branch 'origin/xorg/maint' into xorg/master