[BackupPC/f16: 5/5] Merge branch 'f16' of ssh://pkgs.fedoraproject.org/BackupPC into f16

[Bernard Johnson]

commit d10841d551a97dcc1ad4517b644299a4acb0b315
Merge: e34dc44 5ca7fd5
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Wed Aug 24 17:30:41 2011 -0600

    Merge branch 'f16' of ssh://pkgs.fedoraproject.org/BackupPC into f16
    
    Conflicts:
    	BackupPC.spec

 BackupPC.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc BackupPC.spec
index 8b38a6f,e19a05f..323e773
--- a/BackupPC.spec
+++ b/BackupPC.spec
@@@ -321,11 -310,9 +321,14 @@@ f
  %endif
  
  %changelog
 +* Fri Aug 12 2011 Bernard Johnson <bjohnson at symetrix.com> - 3.2.2-3
 +- change macro conditionals to include tmpfiles.d support starting at
 +  Fedora 15 (bz #730053)
 +- change install lines to preserve timestamps
 +
+ * Mon Aug 15 2011 Kalev Lember <kalevlember at gmail.com> - 3.2.1-1.1
+ - Rebuilt for rpm bug #728707
+ 
  * Fri Jul 08 2011 Bernard Johnson <bjohnson at symetrix.com> - 3.2.1-1
  - v 3.2.1
  - add lower case script URL alias for typing impaired