ckpt
Merge branch 'merge' of github.com:hjelmn/ompi-mca-var into merge

Conflicts:
	ompi/tools/ompi_info/components.c
Ckpt - thru rte
Ckpt - thru sbgp
Ckpt - thru sharedfp
Ckpt - topo
Complete my share of the ompi frameworks
Merge branch 'merge' of github.com:hjelmn/ompi-mca-var into merge

Conflicts:
	ompi/tools/ompi_info/components.c