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

[Charles R. Anderson]

commit 00969db2ab1c61820e84c29246fe9b9dd6349460
Merge: 6798743 c32078b
Author: Charles R. Anderson <cra at wpi.edu>
Date:   Mon Sep 24 09:53:54 2012 -0400

    Merge branch 'master' into el6

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