merge from bioc-devel

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_14/madman/Rpacks/flowStats@90340 bc3139a8-67e5-0310-9ffc-ced21a209358