Add scon build to Makefile.am
Merge branch 'master' of ssh://github.com/open-mpi/orcm
Sync to OMPI trunk r32603
Merge branch 'master' of ssh://github.com/open-mpi/orcm