[python-django-horizon/f17: 2/2] Merge branch 'master' into f17

[Pádraig Brady]

commit dffb35e2f940770cf8c6341e8e15e4471af8f9b1
Merge: a1669d9 169b5a2
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed May 9 16:17:39 2012 +0100

    Merge branch 'master' into f17

 python-django-horizon.spec |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---