# HG changeset patch
# User fschwarz
# Date 1299319035 0
# Node ID 931424efdcf0a5e0b16feed960c7d92297e73f99
# Parent  5ac4af7667a061ca5cca6f0eddac7b45c316b306
merge r568 from trunk

diff --git a/0.9.x/babel/dates.py b/0.9.x/babel/dates.py
--- a/0.9.x/babel/dates.py
+++ b/0.9.x/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')