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