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

[Charles R. Anderson]

commit 4dd39738611b4abbe3667200b5afa5d87fcdc735
Merge: 323f02f cfbfadf
Author: Chuck Anderson <cra at dustpuppy.wpi.edu>
Date:   Fri Aug 31 04:21:22 2012 -0400

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore

 .gitignore                |    4 ++-
 fping-2.4b2_ipv6-fix.diff |   88 ---------------------------------------------
 fping.spec                |   86 ++++++++++++++++++++++++++++++++++---------
 sources                   |    2 +-
 4 files changed, 72 insertions(+), 108 deletions(-)
---