Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 28 Jun 2011 17:04:50 +0000 (19:04 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 28 Jun 2011 17:04:50 +0000 (19:04 +0200)
1  2 
core

diff --cc core
--- 1/core
--- 2/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 508c23e48c10d9b66cb54b4df9931c94565e4c67
 -Subproject commit f9489e456f03733d9d7babc8ab367251b4272792
++Subproject commit a552b53ac5b4e512720d77b457bfda823ed3e10b