[haproxy/el6: 20/20] Merge branch 'f17' into el6

[cheeselee]

commit 8734b97bb3cb5f6f0bca7f0f6a9dcd65a2ab8b50
Merge: 15fac04 a79dfb1
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Fri Oct 12 17:09:28 2012 +0800

    Merge branch 'f17' into el6

 .gitignore   |    5 ++++-
 haproxy.spec |   51 +++++++++++++++++++++++++--------------------------
 sources      |    2 +-
 3 files changed, 30 insertions(+), 28 deletions(-)
---