Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Thu, 30 Jun 2011 22:48:57 +0000 (15:48 -0700)
committerDiane Trout <diane@caltech.edu>
Thu, 30 Jun 2011 22:48:57 +0000 (15:48 -0700)

Trivial merge