Merge branch 'xorg/master' into xorg/f/geocoding
authorStéphane Jacob <sj@m4x.org>
Wed, 4 May 2011 14:58:33 +0000 (16:58 +0200)
committerStéphane Jacob <sj@m4x.org>
Wed, 4 May 2011 14:58:33 +0000 (16:58 +0200)

Trivial merge