[BackupPC/el6: 40/40] Merge branch 'master' into el6

[Bernard Johnson]

commit bbee52617d7fa1798aca7d0750e23eeb38eb37b6
Merge: fe91fdd 7f050ba
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Fri Jul 29 17:26:06 2011 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	BackupPC.spec

 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             |    1 +
 BackupPC.spec                 |  236 ++++++++++++++++++++++++++++++-----------
 BackupPC.tmpfiles             |    1 +
 BackupPC_Admin.c              |   10 ++
 backuppc.service              |   13 +++
 sources                       |    2 +-
 10 files changed, 299 insertions(+), 82 deletions(-)
---