Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 10 May 2011 08:11:53 +0000 (10:11 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 10 May 2011 08:11:53 +0000 (10:11 +0200)
commita65133c609f86680745a34cf18ff0af9296c6b5c
tree07d914802cc10ee7c82a1debaa1d5358223c34e1
parent6ab7cec9e99d6bedba3b19c6600545d02a92b7f8
parent76345d3b64f2ac6327f5ee608cec472de19040f2
Merge branch 'xorg/maint' into xorg/master