[cgit/el6: 4/4] Merge branch 'master' into el6

[Todd Zullinger]

commit e55e6e620d9c416da86cb59d78b3ef82159ad201
Merge: d31f4ba bb87dd9
Author: Todd Zullinger <tmz at pobox.com>
Date:   Fri Jul 22 09:45:45 2011 -0400

    Merge branch 'master' into el6

 ...otential-XSS-vulnerability-in-rename-hint.patch |   39 ++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)
---