Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sat, 16 Jun 2012 17:55:30 +0000 (19:55 +0200)
committerStéphane Jacob <sj@m4x.org>
Sat, 16 Jun 2012 17:55:30 +0000 (19:55 +0200)
commit5ca0a2863c4d7e72fe00d7c8ff98475864216ab8
tree8ae207629839d05a075b3d78951ba2eed4f93253
parent8e78589e2c2bbe2cecc78df3889eacce3ec243d5
parent4617190f38558ead54dae25daca3a82bc6984049
Merge branch 'xorg/maint' into xorg/master