[svn-r22105] Description:

Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously.  The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.

Tested on:
	Mac OSX/64 10.7.3 (amazon) w/debug

tools/h5diff/h5diff_common.h

@@ -17,14 +17,13 @@
 #define H5DIFFCOMMON_H__
 
 #include "h5tools.h"
+/* Name of tool */
+#define PROGRAMNAME "h5diff"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-H5TOOLS_DLLVAR unsigned char g_Parallel;
-H5TOOLS_DLLVAR int g_nTasks;
-
 void usage(void);
 void parse_command_line(int argc, const char* argv[], const char** fname1, const char** fname2, const char** objname1, const char** objname2, diff_opt_t* options);
 void h5diff_exit(int status);