[BackupPC/f14: 6/6] Merge branch 'master' into f14

[Bernard Johnson]

commit bd2fcf0719fa704e1b42ba0c52be166aea28b7c2
Merge: 9e9998e 66b314d
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Wed Aug 24 20:37:40 2011 -0600

    Merge branch 'master' into f14

 BackupPC.spec     |   40 ++++++++++++++++++++++++++++------------
 BackupPC.tmpfiles |    2 +-
 2 files changed, 29 insertions(+), 13 deletions(-)
---