[django-tracking/el5: 5/5] Merge branch 'master' into el5

[Clint Savage]

commit d4be1c8ac06d917bdb0c322a10482f40023ac7cf
Merge: e3f264d 0a96f1c
Author: Clint Savage <herlo1 at gmail.com>
Date:   Sat Jul 23 15:13:01 2011 -0600

    Merge branch 'master' into el5

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