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

[Christof Damian]

commit 9e598ebf5bfdd147ceab6205ff48a1b4f51326b7
Merge: 5839023 7a671c1
Author: Christof Damian <christof at damian.net>
Date:   Fri Mar 2 18:04:57 2012 +0100

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

 .gitignore                                     |    4 ++-
 siege-2.69-good.patch => siege-2.72-good.patch |    0
 siege.spec                                     |   46 ++++++++++++++++++++---
 sources                                        |    2 +-
 4 files changed, 44 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index b9b19de,948f1a6..903af5a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,3 @@@
--siege-2.70.tar.gz
+ /siege-2.71b3.tar.gz
+ /siege-2.69-good.patch
+ /siege-2.72.tar.gz