merge from bioc-devel

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_14/madman/Rpacks/flowWorkspace@90752 bc3139a8-67e5-0310-9ffc-ced21a209358
close #156
Merge branch 'trunk'
Merge commit 'b8848acac725bb15d0ac67aab3badc95603e4e13'