4f5293b Merge branch 'master' into el6

Merged and Committed by stevetraylen 13 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	activemq-cpp.spec
    	sources
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1