[BackupPC/el5: 7/7] Merge branch 'master' into el5

[Bernard Johnson]

commit e8aea836404b5fec32c41d402e5969b03d485c2a
Merge: 5489925 1166e64
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Mon Dec 24 16:55:24 2012 -0700

    Merge branch 'master' into el5

 BackupPC-3.2.1-fix-XSS-vulnerability2.patch |   18 ++++++++++
 BackupPC-3.2.1-qw.patch                     |   28 +++++++++++++++
 BackupPC.htaccess                           |   25 ++++++++++---
 BackupPC.spec                               |   50 ++++++++++++++++----------
 4 files changed, 96 insertions(+), 25 deletions(-)
---