svn merge -r12400:12403 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

src/common/parse_time.c

src/common/parse_time.h

src/plugins/select/bluegene/plugin/opts.c

src/smap/job_functions.c

src/smap/opts.c

src/smap/partition_functions.c

src/smap/smap.h

src/sview/common.c

src/sview/job_info.c

src/sview/part_info.c

src/sview/sview.h