[BackupPC/f15: 30/30] Merge branch 'master' into f15

[Bernard Johnson]

commit eecbc94d589551f6b7f6db5e775d0a5543665f18
Merge: 0b47564 7f050ba
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Fri Jul 29 15:48:43 2011 -0600

    Merge branch 'master' into f15

 .gitignore                   |    1 +
 BackupPC-3.2.1-piddir.patch  |   36 +++++++
 BackupPC-3.2.1-rundir.patch  |   24 +++++
 BackupPC-TopDir_change.patch |   21 ----
 BackupPC.htaccess            |    1 +
 BackupPC.spec                |  217 ++++++++++++++++++++++++++++++------------
 BackupPC.tmpfiles            |    1 +
 backuppc.service             |   13 +++
 sources                      |    2 +-
 9 files changed, 233 insertions(+), 83 deletions(-)
---