Merge branch 'pr/136'

diff --cc babel/dates.py
Simple merge

diff --cc tests/test_dates.py
index 25719299abb0e8bbd8e64d3a9f1fa463d4d11663,43603937898ebb45dbb3ca7fb9d6e6bbfc983092..1f6e7e7dd130ea60c535b8aae55a98604bc25f86
--- 1/tests/test_dates.py
--- 2/tests/test_dates.py
+++ b/tests/test_dates.py
@@@ -189,9 -189,9 +189,9 @@@ class DateTimeFormatTestCase(unittest.T
  
      def test_timezone_name(self):
          tz = timezone('Europe/Paris')
 -        dt = datetime(2007, 4, 1, 15, 30, tzinfo=tz)
 +        dt = tz.localize(datetime(2007, 4, 1, 15, 30))
          fmt = dates.DateTimeFormat(dt, locale='fr_FR')
-         self.assertEqual('Heure : France', fmt['v'])
+         self.assertEqual('heure : France', fmt['v'])
  
      def test_timezone_location_format(self):
          tz = timezone('Europe/Paris')