*** old/django/contrib/humanize/templatetags/humanize.py  2008-07-21 15:20:54.000000000 +0000
--- new/django/contrib/humanize/templatetags/humanize.py   2009-06-15 18:49:34.000000000 +0000
***************
*** 2,8 ****
  from django.utils.encoding import force_unicode
  from django import template
  from django.template import defaultfilters
! from datetime import date
  import re

  register = template.Library()
--- 2,8 ----
  from django.utils.encoding import force_unicode
  from django import template
  from django.template import defaultfilters
! from datetime import date, datetime
  import re

  register = template.Library()
***************
*** 81,86 ****
--- 81,87 ----
      formatted according to settings.DATE_FORMAT.
      """
      try:
+       tzinfo = value.tzinfo
          value = date(value.year, value.month, value.day)
      except AttributeError:
          # Passed value wasn't a date object
***************
*** 88,94 ****
      except ValueError:
          # Date arguments out of range
          return value
!     delta = value - date.today()
      if delta.days == 0:
          return _(u'today')
      elif delta.days == 1:
--- 89,95 ----
      except ValueError:
          # Date arguments out of range
          return value
!     delta = value - datetime.now(tzinfo).replace(microsecond=0,second=0,minute=0,hour=0).date()
      if delta.days == 0:
          return _(u'today')
      elif delta.days == 1: