--- location.tpl.php.20090501.012215	2008-08-21 12:46:37.000000000 -0400
+++ location.tpl.php	2009-05-01 01:25:48.000000000 -0400
@@ -10,19 +10,16 @@
 <?php }?>
 <?php
   if ($city || $province || $postal_code) {
-    $city_province_postal = array();
 
     if ($city) {
-      $city_province_postal[] = '<span class="locality">'. $city .'</span>';
+      echo '<span class="locality">'. $city .'</span>, ';
     }
     if ($province) {
-      $city_province_postal[] = '<span class="region">'. $province .'</span>';
+      echo '<span class="region">'. $province .'</span> ';
     }
     if ($postal_code) {
-      $city_province_postal[] = '<span class="postal-code">'. $postal_code .'</span>';
+      echo '<span class="postal-code">'. $postal_code .'</span>';
     }
-
-    echo implode(', ', $city_province_postal);
   }
 ?>
 <?php if ($country_name) { ?>