Merge proposals dependent on lp://qastaging/~benste/mailmanwebgsoc2011/django-site

lp://qastaging/~benste/mailmanwebgsoc2011/django-site has no merge proposals.