[BackupPC/el5: 51/52] Merge branch 'master' into el5

[Bernard Johnson]

commit 60d8776890f5eb7248f5bc8452622caf0f393df3
Merge: 12092b0 7f050ba
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Fri Jul 29 17:39:50 2011 -0600

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	BackupPC.spec
    	sources

 BackupPC-3.2.1-locatedb.patch |   37 ++++++
 BackupPC-3.2.1-piddir.patch   |   36 ++++++
 BackupPC-3.2.1-rundir.patch   |   24 ++++
 BackupPC-TopDir_change.patch  |   21 ----
 BackupPC.htaccess             |    4 +-
 BackupPC.spec                 |  263 +++++++++++++++++++++++++++++++----------
 BackupPC.tmpfiles             |    1 +
 BackupPC_Admin.c              |   10 ++
 backuppc.service              |   13 ++
 sources                       |    2 +-
 10 files changed, 324 insertions(+), 87 deletions(-)
---