[fping/el5: 2/2] Merge branch 'master' into el5

[Charles R. Anderson]

commit fb93deb2047755c7dc0f4067f36200bb531d75ae
Merge: 4dd3973 c32078b
Author: Charles R. Anderson <cra at wpi.edu>
Date:   Mon Sep 24 09:55:56 2012 -0400

    Merge branch 'master' into el5

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