Fixed a regression with content_type
Merge branch '0.9-maintenance' of github.com:mitsuhiko/werkzeug into 0.9-maintenance

Conflicts: