merge from git

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowViz@85177 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge commit 'f6c542f83cfe045fbbb1fa7ce920ec266275fd8c' into trunk
merge from git

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowViz@85518 bc3139a8-67e5-0310-9ffc-ced21a209358
change type to plotType for .xyplot.flowSet
Merge commit '7b90f8aa8f7211c5a33b378a3d493bad9557e2ef' into trunk
adjust background size(rectangle size) according to the stats text size(cex)