Index: /trunk/src/org/openstreetmap/josm/io/nmea/Sentence.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/nmea/Sentence.java	(revision 12426)
+++ /trunk/src/org/openstreetmap/josm/io/nmea/Sentence.java	(revision 12427)
@@ -199,5 +199,5 @@
 
     /**
-     * ZDA - Time & Date - UTC, day, month, year and local time zone<p>
+     * ZDA - Time &amp; Date - UTC, day, month, year and local time zone<p>
      * <pre>
      *        1         2  3  4    5  6  7
Index: /trunk/src/org/openstreetmap/josm/io/nmea/TalkerId.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/nmea/TalkerId.java	(revision 12426)
+++ /trunk/src/org/openstreetmap/josm/io/nmea/TalkerId.java	(revision 12427)
@@ -11,5 +11,5 @@
     /** BeiDou (China) */
     BD,
-    /** Electronic Chart Display & Information System (ECDIS) */
+    /** Electronic Chart Display &amp; Information System (ECDIS) */
     EC,
     /** Galileo (Europe) */