Commits

[svn-r20716] Updated from trunk and resolved conflicts. tested on phoenix (serial -- with and without aio) jam (serial -- gcc, intel, and PGI compiler, with and without aio)
[svn-r20716] Updated from trunk and resolved conflicts. tested on phoenix (serial -- with and without aio) jam (serial -- gcc, intel, and PGI compiler, with and without aio)