Merge branch 'el6'

Conflicts:
	python-boto.spec

python-boto.spec

@@ -2,7 +2,7 @@
 Summary:        A simple lightweight interface to Amazon Web Services
 Name:           python-boto
 Version:        2.9.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Group:          Development/Languages
 URL:            https://github.com/boto/boto
@@ -16,6 +16,7 @@ Patch1:         boto-2.9.6-adjtype.patch
 # Needed for euca-register --virtualization-type, requested by rel-eng
 Patch2:         boto-2.9.6-virttype.patch
 
+
 %description
 Boto is a Python package that provides interfaces to Amazon Web Services.
 It supports S3 (Simple Storage Service), SQS (Simple Queue Service) via
@@ -61,6 +62,9 @@ rm -r boto.egg-info
 %{python_sitelib}/boto*.egg-info
 
 %changelog
+* Fri Jun 21 2013 Garrett Holmstrom <gholms@fedoraproject.org> - 2.9.6-2
+- Rebuilt after merge
+
 * Fri Jun 21 2013 Garrett Holmstrom <gholms@fedoraproject.org> - 2.9.6-1
 - Updated to 2.9.6
 - Fixed autoscaling policy parsing (boto #1538)
@@ -72,6 +76,9 @@ rm -r boto.egg-info
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
+* Tue Jan  8 2013 Garrett Holmstrom <gholms@fedoraproject.org> - 2.5.2-3
+- Fixed parsing of current/previous instance state data (boto #881)
+
 * Wed Nov 21 2012 Garrett Holmstrom <gholms@fedoraproject.org> - 2.6.0-2
 - Updated to 2.6.0 (#876517)
 - Note that this version enables SSL cert verification by default.