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)
commitcb6e7db980fcc5fcdd2dad5aa645cfdf98057cd4
tree5e25c662a9b184241a398217f8ddf8a32ce8eea8
parent006158ff4b73f7f407e1cd6ed649a457cf989ffc
parent8a0908db6bddf4160806d94c775ca7363447d67f
Merge branch 'xorg/master' into xorg/f/geocoding