[fence-agents/f16: 4/4] Merge branch 'master' into f16

[Marek Grác]

commit cd464e17a2be9554c218224711b670c8627e089b
Merge: 2c936c0 0de0a67
Author: Marek 'marx' Grac <mgrac at redhat.com>
Date:   Mon Dec 12 14:09:16 2011 +0100

    Merge branch 'master' into f16

 .gitignore        |    1 +
 fence-agents.spec |    8 ++++++--
 sources           |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --cc fence-agents.spec
index f3b61d9,bd01fbe..313608f
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@@ -84,7 -85,10 +85,10 @@@ power management for several devices
  %{_mandir}/man8/fence*
  
  %changelog
+ * Mon Dec 12 2011 Marek Grac <mgrac at redhat.com> - 3.1.7-3
+ - new upstream release
+ 
 -* Wed Oct  5 2011 Marek Grac <mgrac at redhat.com> - 3.1.6-1
 +* Wed Oct 24 2011 Marek Grac <mgrac at redhat.com> - 3.1.6-1
  - new upstream release
  
  * Fri Jul  8 2011 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.1.5-1