Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Fri, 17 Jun 2011 23:08:20 +0000 (16:08 -0700)
committerDiane Trout <diane@caltech.edu>
Fri, 17 Jun 2011 23:08:20 +0000 (16:08 -0700)

Trivial merge