merge from bioc-devel

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_14/madman/Rpacks/ncdfFlow@90101 bc3139a8-67e5-0310-9ffc-ced21a209358
fix the check error. #21
Merge branch 'trunk'
Merge commit 'e0ba525dc669e4c3627d19f68a524ce2f2956562'