[django-tracking/f14: 6/6] merged updates from master

[Clint Savage]

commit bf01045675ef1304190ed71027246f94c49c050e
Merge: 6fd6a98 0a96f1c
Author: Clint Savage <herlo1 at gmail.com>
Date:   Sat Jul 23 15:05:36 2011 -0600

    merged updates from master

 django-tracking.spec |   23 ++++++++++++++---------
 sources              |    2 +-
 views.py.patch       |    8 ++++++++
 3 files changed, 23 insertions(+), 10 deletions(-)
---