[stomppy/el6/master: 10/10] Merge branch 'master' into el6

[stevetraylen]

commit 3fb95e418cf4915ff2c67c528c1d9832883296ab
Merge: 4c5b06b 4fe46ea
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Tue Aug 24 17:03:52 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	stomppy.spec

 .gitignore   |    2 +-
 sources      |    2 +-
 stomppy.spec |   16 +++++++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index 226dda8,7bbdcde..7086a40
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--stomp.py-3.0.1-beta2.tar.gz
 -/stomp.py-3.0.2a.tar.gz
++stomp.py-3.0.2a.tar.gz