From: Stéphane Jacob <sj@m4x.org>
Date: Tue, 28 Jun 2011 17:04:50 +0000 (+0200)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.2~1
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=e22ff176d83e1f4ffd866e6ad928ee247906c6a5;p=platal.git

Merge branch 'xorg/maint' into xorg/master
---

e22ff176d83e1f4ffd866e6ad928ee247906c6a5
diff --cc core
index 508c23e,f9489e4..a552b53
--- a/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 508c23e48c10d9b66cb54b4df9931c94565e4c67
 -Subproject commit f9489e456f03733d9d7babc8ab367251b4272792
++Subproject commit a552b53ac5b4e512720d77b457bfda823ed3e10b