Index: trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java	(revision 2871)
+++ trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java	(revision 2874)
@@ -11,4 +11,5 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.DateUtils;
+import org.openstreetmap.josm.tools.PrimaryDateParser;
 
 public class WayPoint extends WithAttributes implements Comparable<WayPoint>
@@ -42,9 +43,10 @@
      */
     public void setTime() {
-        if(attr.containsKey("time"))
-        {
-            double t = DateUtils.fromString(attr.get("time").toString()).getTime();
-            if(t != 0.0) {
-                time = t / 1000.0; /* ms => seconds */
+        if(attr.containsKey("time")) {
+            PrimaryDateParser dateParser = new PrimaryDateParser();
+            try {
+                time = dateParser.parse(attr.get("time").toString()).getTime() / 1000.; /* ms => seconds */
+            } catch(Exception e) {
+                time = 0;
             }
         }