Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Thu, 30 Jun 2011 21:45:05 +0000 (14:45 -0700)
committerDiane Trout <diane@caltech.edu>
Thu, 30 Jun 2011 21:45:05 +0000 (14:45 -0700)

Trivial merge