merge from bioc-devel

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_13/madman/Rpacks/flowWorkspace@86222 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge commit 'e0249b7b75faf594282b13c5374d7aa3143ab8be'
fix another typo. #138
Merge branch 'master' of github.com:RGLab/flowWorkspace
Merge branch 'trunk'