# HG changeset patch
# User fschwarz
# Date 1299319035 0
# Node ID 790d49d8ba305b97c156f91aafec06b7ccdc13c9
# Parent  f46bdfd4a333bed56b09b57906d33b9780fda653
merge r568 from trunk

diff --git a/babel/dates.py b/babel/dates.py
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -220,7 +220,7 @@
     """Return a representation of the given timezone using "location format".
     
     The result depends on both the local display name of the country and the
-    city assocaited with the time zone:
+    city associated with the time zone:
     
     >>> from pytz import timezone
     >>> tz = timezone('America/St_Johns')