Merged in changes from development repository:

   Finished updating manual to account for the `delete metadata' and `undelete metadata' commands.
Updated generated files.
Merged in changes from development repository:

   Turned off debugging output.  Minor correction.