svn merge -r13622:13696 https://eris.llnl.gov/svn/slurm/branches/acct_da

src/common/assoc_mgr.c

src/common/assoc_mgr.h

src/common/node_select.c

src/common/slurm_accounting_storage.c

src/common/slurm_accounting_storage.h

src/common/slurm_protocol_defs.c

src/common/slurm_protocol_defs.h

src/common/slurm_protocol_pack.c

src/common/slurmdbd_defs.c

src/common/slurmdbd_defs.h

src/database/mysql_common.c

src/database/mysql_common.h

src/database/pgsql_common.c

src/database/pgsql_common.h

...s/accounting_storage/filetxt/accounting_storage_filetxt.c

...plugins/accounting_storage/gold/accounting_storage_gold.c

...ugins/accounting_storage/mysql/accounting_storage_mysql.c

src/plugins/accounting_storage/mysql/mysql_jobacct_process.c

src/plugins/accounting_storage/mysql/mysql_jobacct_process.h

...plugins/accounting_storage/none/accounting_storage_none.c