Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 4242)
+++ /trunk/build.xml	(revision 4243)
@@ -21,9 +21,9 @@
     </condition>
     <!-- Java classpath addition (all jar files to compile tests with this) -->
-    <path id="classpath">
+    <!-- <path id="classpath">
         <fileset dir="lib">
             <include name="**/*.jar"/>
         </fileset>
-    </path>
+    </path> -->
     <!--
 	  ** Used by Eclipse ant builder for updating
@@ -106,6 +106,6 @@
     </target>
     <target name="compile" depends="init">
-        <javac srcdir="src" classpathref="classpath" includes="com/drew/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="iso-8859-1"/>
-        <javac srcdir="src" classpathref="classpath" excludes="com/drew/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
+        <javac srcdir="src" includes="com/drew/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="iso-8859-1"/>
+        <javac srcdir="src" excludes="com/drew/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 4242)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 4243)
@@ -605,5 +605,5 @@
         putDefault(key, Integer.toString(def));
         String v = get(key);
-        if(null == v)
+        if(v.isEmpty())
             return def;
 
@@ -619,7 +619,7 @@
         putDefault(key, Integer.toString(def));
         String v = get(key+"."+specName);
-        if(null == v)
+        if(v.isEmpty())
             v = get(key);
-        if(null == v)
+        if(v.isEmpty())
             return def;
 
Index: /trunk/src/org/openstreetmap/josm/io/NmeaReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/NmeaReader.java	(revision 4242)
+++ /trunk/src/org/openstreetmap/josm/io/NmeaReader.java	(revision 4243)
@@ -266,5 +266,5 @@
 
             // handle the packet content
-            if(e[0].equals("$GPGGA")) {
+            if(e[0].equals("$GPGGA") || e[0].equals("$GNGGA")) {
                 // Position
                 LatLon latLon = parseLatLon(
@@ -346,5 +346,5 @@
                     }
                 }
-            } else if(e[0].equals("$GPVTG")) {
+            } else if(e[0].equals("$GPVTG") || e[0].equals("$GNVTG")) {
                 // COURSE
                 accu = e[GPVTG.COURSE_REF.position];
@@ -367,5 +367,5 @@
                     }
                 }
-            } else if(e[0].equals("$GPGSA")) {
+            } else if(e[0].equals("$GPGSA") || e[0].equals("$GNGSA")) {
                 // vdop
                 accu=e[GPGSA.VDOP.position];
@@ -384,5 +384,5 @@
                 }
             }
-            else if(e[0].equals("$GPRMC")) {
+            else if(e[0].equals("$GPRMC") || e[0].equals("$GNRMC")) {
                 // coordinates
                 LatLon latLon = parseLatLon(