Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Thu, 3 Feb 2011 19:50:12 +0000 (11:50 -0800)
committerDiane Trout <diane@caltech.edu>
Thu, 3 Feb 2011 19:50:12 +0000 (11:50 -0800)

Trivial merge