[haproxy/f15: 2/2] Merge branch 'master' into f15

[jjh]

commit 6943c894131e7aa3851e21aad9feb1d26d1cdec2
Merge: 785abf3 6bfc809
Author: Jeremy Hinegardner <jeremy at hinegardner.org>
Date:   Thu Sep 22 03:21:15 2011 -0600

    Merge branch 'master' into f15

 .gitignore   |    1 +
 haproxy.spec |    9 ++++++---
 sources      |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---