[svn-r20383] Description:

Bring r19714:20382 from trunk to revise_chunks branch

Tested:
    Linux 2.6/64 (chicago)

tools/testfiles/help-1.ls

@@ -4,9 +4,14 @@
 usage: h5ls [OPTIONS] [OBJECTS...]
   OPTIONS
    -h, -?, --help  Print a usage message and exit
-   -a, --address   Print addresses for raw data
+   -a, --address   Print raw data address.  If dataset is contiguous, address
+                   is offset in file of beginning of raw data. If chunked,
+                   returned list of addresses indicates offset of each chunk.
+                   Must be used with -v, --verbose option.
+                   Provides no information for non-dataset objects.
    -d, --data      Print the values of datasets
-   -e, --errors    Show all HDF5 error reporting
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
                    Follow symbolic links (soft links and external links)
                    to display target object information.
@@ -52,3 +57,5 @@ usage: h5ls [OPTIONS] [OBJECTS...]
 
    -E or --external   Follow external links.
                       Replaced by --follow-symlinks.
+   -e, --errors       Show all HDF5 error reporting
+                      Replaced by --enable-error-stack.