[condor/f17: 3/3] Merge branch 'f16' into f17

[tstclair]

commit a04ffdb965766389d66c9967b7de294acd088f00
Merge: add1455 372fe26
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Wed Mar 7 13:25:31 2012 -0600

    Merge branch 'f16' into f17
    
    Conflicts:
    	condor.spec

 condor.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc condor.spec
index 41cfbf5,a6c0772..57f0ce2
--- a/condor.spec
+++ b/condor.spec
@@@ -1010,9 -1010,9 +1010,12 @@@ f
  %endif
  
  %changelog
+ * Thu Mar 7 2012 <tstclair at redhat.com> - 7.7.5-0.2
+ - Fast forward to 7.7.5 release
+ 
 +* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.7.5-0.1.2
 +- Rebuilt for c++ ABI breakage
 +
  * Thu Feb 9 2012 <tstclair at redhat.com> - 7.7.5-0.1
  - Fast forward to 7.7.5 pre release