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

[Bernard Johnson]

commit 1efb7d14ed5d7ba973084bf919dabf0e8c8e0de0
Merge: bbee526 3995015
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Mon Sep 26 16:23:21 2011 -0600

    Merge branch 'master' into el6

 BackupPC.spec     |   97 +++++++++++++++++++++++++++++++++++-----------------
 BackupPC.tmpfiles |    2 +-
 2 files changed, 66 insertions(+), 33 deletions(-)
---