[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

1 files changed, 5 insertions, 8 deletions

diff --git a/tools/testfiles/tchar1.ddl b/tools/testfiles/tchar1.ddl
index cc2d838..78acaf0 100644
--- a/tools/testfiles/tchar1.ddl
+++ b/tools/testfiles/tchar1.ddl
@@ -1,17 +1,14 @@
-#############################
-Expected output for 'h5dump -r tchar.h5'
-#############################
 HDF5 "tchar.h5" {
 GROUP "/" {
    DATASET "Dataset1" {
       DATATYPE  H5T_STD_I8LE
       DATASPACE  SIMPLE { ( 308 ) / ( 308 ) }
       DATA {
-         "Four score and seven years ago our forefathers brought forth on this "
-         "continent a new nation, conceived in liberty and dedicated to the pro"
-         "position that all men are created equal. Now we are engaged in a grea"
-         "t civil war, testing whether that nation or any nation so conceived a"
-         "nd so dedicated can long endure."
+         "Four score and seven years ago our forefathers brought forth on th"
+         "is continent a new nation, conceived in liberty and dedicated to t"
+         "he proposition that all men are created equal. Now we are engaged "
+         "in a great civil war, testing whether that nation or any nation so"
+         " conceived and so dedicated can long endure."
       }
    }
 }