Merge branch 'master' of ssh://git.fsl.cs.sunysb.edu/scm/git/am-utils-6.2

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 43a162aeec467d19f815d5c80a0e0a96c2b9366a,868308ef1a6ed97ec954091c80af877fa75832dc..3684bc4e028baa62693bd0f77ec577d252b4be0a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,21 +1,25 @@@
 +2012-07-25  Christos Zoulas <christos@zoulas.com>
 +
 +      * bug fixes for lustre rhost parsing
 +
+ 2012-06-27  Christos Zoulas <christos@zoulas.com>
+ 
+       * Disable 1/2-baked sun map support to avoid SIGSEGV
+ 
+ 2012-06-16  Christos Zoulas <christos@zoulas.com>
+ 
+       *******************************************************************
+       *** Released am-utils-6.2-rc1                                   ***
+       *******************************************************************
+ 
+       * Fix libtool.m4 to work with later versions of autoconf.
+       * In buildall, use eval so that quoted strings work
+       * Centralize nfs version checking function, and introduce
+         new configuration variable nfs_vers_ping, which is the
+         max version we ping for. This is not documented yet, because
+         there might be a better way separate the max version we can
+         use vs the max version we ping for.
+ 
  2012-06-09  Christos Zoulas <christos@zoulas.com>
  
        * fix issue with parsing nfsv4 security option strings

diff --cc include/am_utils.h
Simple merge