Merge branch 'hotfix/date'
authorKenneth Reitz <me@kennethreitz.com>
Sat, 19 Feb 2011 06:30:10 +0000 (01:30 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 19 Feb 2011 06:30:10 +0000 (01:30 -0500)

Trivial merge