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

[Bernard Johnson]

commit 49e88355e357cd92c499c1fdfd418ef9c9b85dcd
Merge: 9848779 3995015
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Mon Sep 26 16:35:17 2011 -0600

    Merge branch 'master' into el5

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