From: Stéphane Jacob Date: Wed, 18 May 2011 13:27:43 +0000 (+0200) Subject: Merge branch 'xorg/master' into xorg/f/geocoding X-Git-Tag: xorg/1.1.2~62^2~11 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=e999a40a812f8a2f350d69c5e1611669ff8937d1;p=platal.git Merge branch 'xorg/master' into xorg/f/geocoding --- e999a40a812f8a2f350d69c5e1611669ff8937d1