Merged trunk r1716 into the ProbABEL-pvals branch.

Code compiles, but doesn't pass all checks yet (it didn't pass them before this commit either, so nothing's lost).


git-svn-id: svn://svn.r-forge.r-project.org/svnroot/genabel@1718 edb9625f-4e0d-4859-8d74-9fd3b1da38cb