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

[Christof Damian]

commit 3fc71ebd1ba8d4a569edac0829addf5f968206c8
Merge: a46e8bf 618ef9e
Author: Christof Damian <christof at damian.net>
Date:   Fri Mar 1 22:19:54 2013 +0100

    Merge branch 'master' into f18

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