resync gpsd with old trunk version