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

[jjh]

commit c6cb3f899920bd8e72a86484cf22db9ae2ac0c48
Merge: da8fcc1 13d35c0
Author: Jeremy Hinegardner <jeremy at hinegardner.org>
Date:   Tue Apr 26 22:46:00 2011 -0600

    Merge branch 'master' into f14/master

 .gitignore   |    1 +
 haproxy.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---