Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sat, 9 Apr 2011 15:31:19 +0000 (17:31 +0200)
committerStéphane Jacob <sj@m4x.org>
Sat, 9 Apr 2011 15:31:19 +0000 (17:31 +0200)
commitb65169f172b0b06c7731cfc67aaea15081fc0d31
tree97091eac7f0f8fbd2128bfc443b65e3b28f92fbc
parentb4b826ea1f852c966fc7a10944a21175e10afdef
parentca2f19b8facc5de72604809c34ae64c800b79a13
Merge branch 'xorg/maint' into xorg/master