[opensm: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/opensm

[Doug Ledford]

commit 9fd1c2bf00303ea176d8fa0f200bbeed79c7580c
Merge: c5a5a1f ed7ac61
Author: Doug Ledford <dledford at redhat.com>
Date:   Tue Jan 3 15:28:25 2012 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/opensm
    
    Conflicts:
    	opensm.spec

 opensm.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc opensm.spec
index 196254a,641851a..6b34d7d
--- a/opensm.spec
+++ b/opensm.spec
@@@ -112,9 -110,9 +112,12 @@@ f
  %{_libdir}/lib*.a
  
  %changelog
 +* Tue Jan 03 2012 Doug Ledford <dledford at redhat.com> - 3.3.12-1
 +- Update to latest upstream version
 +
+ * Mon Aug 15 2011 Kalev Lember <kalevlember at gmail.com> - 3.3.9-2
+ - Rebuilt for rpm bug #728707
+ 
  * Wed Jul 20 2011 Doug Ledford <dledford at redhat.com> - 3.3.9-1
  - Update to latest upstream version
  - Add /etc/sysconfig/opensm for use by opensm init script