merge from biocdevel

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_13/madman/Rpacks/openCyto@87340 bc3139a8-67e5-0310-9ffc-ced21a209358
fix Rd
Merge branch 'trunk'
Merge branch 'master' of github.com:RGLab/openCyto
Merge commit 'db54bc2853862544c8c853943cf40bcec4cfa682'