Merge branch 'f17'

Conflicts:
	.gitignore
	freeipmi.spec
	sources

.gitignore

@@ -15,3 +15,4 @@ freeipmi-0.8.8.tar.gz
 /freeipmi-1.0.10.tar.gz
 /freeipmi-1.1.1.tar.gz
 /freeipmi-1.1.2.tar.gz
+/freeipmi-1.1.3.tar.gz

freeipmi.spec

@@ -5,7 +5,7 @@
 Release: 1%{?dist}
 
 Name: freeipmi
-Version: 1.1.2
+Version: 1.1.3
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/freeipmi/
@@ -359,6 +359,26 @@ fi
 %{_unitdir}/ipmidetectd.service
 
 %changelog
+* Wed Mar  7 2012 Jan Safranek <jsafrane@redhat.com> - 1.1.3-1
+- Updated to freeipmi-1.1.3:
+  - Support Supermicro CPU temperature SEL events.
+  - In ipmi-oem, fix corner case with Dell C410x power control
+    calculation.
+  - In all tools, fix error messages to differentiate between invalid
+    and unsupported cipher suite IDs.
+  - In bmc-config, fix a Cipher Suite Privilege configuration
+    corner case in the workaround for an HP DL145 workaround.
+  - In bmc-config, add workaround for Cipher Suite Privilege
+    configuration on Intel S2600JF/Appro 512X.
+  - Various documentation updates.
+  - In libfreeipmi, fix incorrect packet layout for the Get Lan
+    Configuration Parameters RMCPplus Messaging Cipher Suite Entry Support
+    response.
+  - In libipmimonitoring, properly return connection timeout error on
+    connection timeout.
+  - Fix build when using --docdir. 
+  - Various documentation updates.
+
 * Wed Feb  8 2012 Jan Safranek <jsafrane@redhat.com> - 1.1.2-1
 - Updated to freeipmi-1.1.2:
   - In ipmi-oem, support new Dell C410x OEM extensions

sources

@@ -1 +1 @@
-0e87f02abf95f8114919a9d67d8d5caa  freeipmi-1.1.2.tar.gz
+c3d3f1cb796dfbea363258120001d34b  freeipmi-1.1.3.tar.gz