--- mythtv-original/mythtv/programs/mythfilldatabase/channeldata.cpp	2011-09-18 12:05:56 -0400
+++ mythtv/mythtv/programs/mythfilldatabase/channeldata.cpp	2011-09-18 20:39:28 -0400
@@ -270,8 +270,8 @@
                                      " WHERE xmltvid = :XMLTVID "
                                      "AND sourceid = :SOURCEID;");
                     subquery.bindValue(":CHANID", chanid);
-                    subquery.bindValue(":NAME", (*i).name);
-                    subquery.bindValue(":CALLSIGN", (*i).callsign);
+                    subquery.bindValue(":NAME", (*i).name.trimmed());
+                    subquery.bindValue(":CALLSIGN", (*i).callsign.trimmed());
                     subquery.bindValue(":CHANNUM", (*i).chanstr);
                     subquery.bindValue(":FINE", (*i).finetune.toInt());
                     subquery.bindValue(":ICON", localfile);