merge from bioc-devel

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_14/madman/Rpacks/flowCore@90338 bc3139a8-67e5-0310-9ffc-ced21a209358
fix error in vignette
Merge branch 'trunk'
Merge commit '204a3ba2f11e12990f1b4c1a2deb104473ed9f95'