Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Wed, 26 Oct 2011 13:29:59 +0000 (15:29 +0200)
committerStéphane Jacob <sj@m4x.org>
Wed, 26 Oct 2011 13:29:59 +0000 (15:29 +0200)
commitba1cbd51cd218c3a8caf6d9518df9d2367a9ae54
tree0b30338ac72afb888137a1987283e6f0f7d7478e
parente017b499b5718874ce09a008bcf546472024c68b
parent4dc5be4459eaacfa27d75b8e6afa3b97bd7094dc
Merge branch 'xorg/maint' into xorg/master