[python-txamqp/el6: 5/5] Merge branch 'f17' into el6

[Silas Sewell]

commit 484eb89a30819e83772d4ef608a5a9bc73775c18
Merge: 88404ab 1bc7479
Author: Silas Sewell <silas at sewell.org>
Date:   Thu Dec 27 11:42:53 2012 -0500

    Merge branch 'f17' into el6
    
    Conflicts:
    	.gitignore
    	python-txamqp.spec
    	sources

 .gitignore                        |    1 +
 python-txamqp-0.3.spec-path.patch |   53 -------------------------------------
 python-txamqp.spec                |   19 ++++++++-----
 sources                           |    4 +++
 4 files changed, 17 insertions(+), 60 deletions(-)
---
diff --cc sources
index 2b4a8e0,171ba9f..0234996
--- a/sources
+++ b/sources
@@@ -1,1 -1,2 +1,5 @@@
  984aa9c7195549c12a0aaae92b6fe503  python-txamqp_0.3.orig.tar.gz
++<<<<<<< HEAD
++=======
+ c082f994d00fca5f3664c80827bf2622  txAMQP-0.6.1.tar.gz
++>>>>>>> f17