[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, 24 insertions, 15 deletions

diff --git a/tools/testfiles/tarray5.ddl b/tools/testfiles/tarray5.ddl
index 49eda3e..883ee09 100644
--- a/tools/testfiles/tarray5.ddl
+++ b/tools/testfiles/tarray5.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5dump tarray5.h5'
-#############################
 HDF5 "tarray5.h5" {
 GROUP "/" {
    DATASET "Dataset1" {
@@ -13,52 +10,64 @@ GROUP "/" {
       (0): [ {
                0,
                [ 0, 1, 2, 3 ]
-            }, {
+            },
+             {
                1,
                [ 2.5, 3.5, 4.5, 5.5 ]
-            }, {
+            },
+             {
                2,
                [ 5, 6, 7, 8 ]
-            }, {
+            },
+             {
                3,
                [ 7.5, 8.5, 9.5, 10.5 ]
             } ],
       (1): [ {
                10,
                [ 10, 11, 12, 13 ]
-            }, {
+            },
+             {
                11,
                [ 12.5, 13.5, 14.5, 15.5 ]
-            }, {
+            },
+             {
                12,
                [ 15, 16, 17, 18 ]
-            }, {
+            },
+             {
                13,
                [ 17.5, 18.5, 19.5, 20.5 ]
             } ],
       (2): [ {
                20,
                [ 20, 21, 22, 23 ]
-            }, {
+            },
+             {
                21,
                [ 22.5, 23.5, 24.5, 25.5 ]
-            }, {
+            },
+             {
                22,
                [ 25, 26, 27, 28 ]
-            }, {
+            },
+             {
                23,
                [ 27.5, 28.5, 29.5, 30.5 ]
             } ],
       (3): [ {
                30,
                [ 30, 31, 32, 33 ]
-            }, {
+            },
+             {
                31,
                [ 32.5, 33.5, 34.5, 35.5 ]
-            }, {
+            },
+             {
                32,
                [ 35, 36, 37, 38 ]
-            }, {
+            },
+             {
                33,
                [ 37.5, 38.5, 39.5, 40.5 ]
             } ]