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

[Bernard Johnson]

commit d4bb1b3d447a4b968e2ce5446965aab8cd6ea362
Merge: bd2fcf0 3995015
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Mon Sep 26 16:17:25 2011 -0600

    Merge branch 'master' into f14

 BackupPC.spec |   59 ++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 38 insertions(+), 21 deletions(-)
---