[haproxy/f14/master: 5/5] Merge branch 'f15/master' into f14/master

[jjh]

commit da8fcc19e682319a387d2ccd727c080e0a491334
Merge: c68378f a415cbb
Author: Jeremy Hinegardner <jeremy at hinegardner.org>
Date:   Sun Feb 27 22:03:34 2011 -0700

    Merge branch 'f15/master' into f14/master

 .gitignore   |    2 ++
 haproxy.cfg  |   22 +++++++++++-----------
 haproxy.spec |   11 ++++++++++-
 sources      |    2 +-
 4 files changed, 24 insertions(+), 13 deletions(-)
---