[python-django-horizon/el6] (11 commits) ...Merge branch 'f17' into el6