Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 14446)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 14447)
@@ -10,5 +10,4 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
-import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,5 +31,4 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.date.DateUtils;
 import org.openstreetmap.josm.tools.template_engine.ParseError;
 import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
@@ -207,5 +205,4 @@
     public static final String LABEL_PATTERN_DESC = "{desc}";
 
-    private final DateFormat timeFormatter = DateUtils.getGpxFormat();
     private final TemplateEngineDataProvider dataProvider;
     private final String text;
Index: /trunk/src/org/openstreetmap/josm/io/GpxReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/GpxReader.java	(revision 14446)
+++ /trunk/src/org/openstreetmap/josm/io/GpxReader.java	(revision 14447)
@@ -432,4 +432,6 @@
                 case "url":
                 case "urlname":
+                case "cmt":
+                case "desc":
                     currentWayPoint.put(localName, accumulator.toString());
                     break;
@@ -449,8 +451,4 @@
                         Logging.error(e);
                     }
-                    break;
-                case "cmt":
-                case "desc":
-                    currentWayPoint.put(localName, accumulator.toString());
                     break;
                 case "rtept":