Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 7048)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 7049)
@@ -257,10 +257,4 @@
     }
 
-    private static final DateFormat timeFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-    static {
-         TimeZone tz = TimeZone.getTimeZone("UTC");
-         timeFormatter.setTimeZone(tz);
-    }
-
     public static final String MARKER_OFFSET = "waypointOffset";
     public static final String MARKER_FORMATTED_OFFSET = "formattedWaypointOffset";
@@ -270,4 +264,5 @@
     public static final String LABEL_PATTERN_DESC = "{desc}";
 
+    private final DateFormat timeFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
     private final TemplateEngineDataProvider dataProvider;
     private final String text;
@@ -288,4 +283,13 @@
 
     public Marker(LatLon ll, TemplateEngineDataProvider dataProvider, String iconName, MarkerLayer parentLayer, double time, double offset) {
+        this(ll, dataProvider, null, iconName, parentLayer, time, offset);
+    }
+
+    public Marker(LatLon ll, String text, String iconName, MarkerLayer parentLayer, double time, double offset) {
+        this(ll, null, text, iconName, parentLayer, time, offset);
+    }
+
+    private Marker(LatLon ll, TemplateEngineDataProvider dataProvider, String text, String iconName, MarkerLayer parentLayer, double time, double offset) {
+        timeFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
         setCoor(ll);
 
@@ -296,16 +300,4 @@
 
         this.dataProvider = dataProvider;
-        this.text = null;
-    }
-
-    public Marker(LatLon ll, String text, String iconName, MarkerLayer parentLayer, double time, double offset) {
-        setCoor(ll);
-
-        this.offset = offset;
-        this.time = time;
-        this.symbol = iconName != null ? ImageProvider.getIfAvailable("markers",iconName) : null;
-        this.parentLayer = parentLayer;
-
-        this.dataProvider = null;
         this.text = text;
     }
Index: trunk/src/org/openstreetmap/josm/io/NmeaReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/NmeaReader.java	(revision 7048)
+++ trunk/src/org/openstreetmap/josm/io/NmeaReader.java	(revision 7049)
@@ -21,6 +21,6 @@
 
 /**
- * Read a nmea file. Based on information from
- * http://www.kowoma.de/gps/zusatzerklaerungen/NMEA.htm
+ * Reads a NMEA file. Based on information from
+ * <a href="http://www.kowoma.de/gps/zusatzerklaerungen/NMEA.htm">http://www.kowoma.de</a>
  *
  * @author cbrill
@@ -132,15 +132,11 @@
     public GpxData data;
 
-    //  private static final SimpleDateFormat GGATIMEFMT =
-    //      new SimpleDateFormat("HHmmss.SSS");
-    private static final SimpleDateFormat RMCTIMEFMT =
-        new SimpleDateFormat("ddMMyyHHmmss.SSS");
-    private static final SimpleDateFormat RMCTIMEFMTSTD =
-        new SimpleDateFormat("ddMMyyHHmmss");
+    private final SimpleDateFormat rmcTimeFmt = new SimpleDateFormat("ddMMyyHHmmss.SSS");
+    private final SimpleDateFormat rmcTimeFmtStd = new SimpleDateFormat("ddMMyyHHmmss");
 
     private Date readTime(String p) {
-        Date d = RMCTIMEFMT.parse(p, new ParsePosition(0));
+        Date d = rmcTimeFmt.parse(p, new ParsePosition(0));
         if (d == null) {
-            d = RMCTIMEFMTSTD.parse(p, new ParsePosition(0));
+            d = rmcTimeFmtStd.parse(p, new ParsePosition(0));
         }
         if (d == null)