add a non-conflicting line in git Thu Dec 12 16:28:59 PST 2013

From: Dan Tenenbaum <dtenenba@fhcrc.org>

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/RpacksTesting/gitsvntest0@84474 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge branch 'local-hedgehog'