Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sun, 10 Jun 2012 16:38:13 +0000 (18:38 +0200)
committerStéphane Jacob <sj@m4x.org>
Sun, 10 Jun 2012 16:38:13 +0000 (18:38 +0200)
commit60fcf4a4e745bcca53baf3789f6eb67047447651
treeb6b6eb66452d53d98684b4ffc5a1f00b70c6cae8
parent9f99387fdca8d99abf959a7df3f8706ea57dcdcd
parentfdd539e9bf8c46ef5464b1e642dca8b7dc6ae87e
Merge branch 'xorg/maint' into xorg/master