[fping/el6: 13/14] Merge branch 'master' into el6

[Charles R. Anderson]

commit 4d38b42b4faf53270eeb3cc957e936f18b904f16
Merge: d433737 cfbfadf
Author: Chuck Anderson <cra at dustpuppy.wpi.edu>
Date:   Fri Aug 31 04:06:03 2012 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                |    1 -
 fping-2.4b2_ipv6-fix.diff |   88 ---------------------------------------------
 fping.spec                |   76 +++++++++++++++++++++++++++++----------
 sources                   |    2 +-
 4 files changed, 58 insertions(+), 109 deletions(-)
---