Merge branch 'xorg/1.0.2/master'
authorStéphane Jacob <sj@m4x.org>
Wed, 29 Dec 2010 01:40:59 +0000 (02:40 +0100)
committerStéphane Jacob <sj@m4x.org>
Wed, 29 Dec 2010 01:40:59 +0000 (02:40 +0100)

Trivial merge