Support gpsd 2.96 and 3.1.

Patch based on Vincent Batts patch submitted in bug 269165, thanks!
Tested with gpsd 2.96 (berlios tarball), gpsd 3.1 (berlios tarball)
and 2.95 (ubuntu package).
CCBUG: 269165
FIXED-IN: KDE-4.7.2/Marble-1.2.2
(cherry picked from commit 9aa0e1e7)