[siege/f18: 4/4] Merge branch 'master' into f18

[Christof Damian]

commit a46e8bf680961415598dbe805ca1381ef31e2aee
Merge: 67d4613 9587e73
Author: Christof Damian <christof at damian.net>
Date:   Sat Feb 23 20:53:56 2013 +0100

    Merge branch 'master' into f18

 .gitignore |    1 +
 siege.spec |   12 +++++++++---
 sources    |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---