Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Fri, 13 Apr 2012 17:57:18 +0000 (10:57 -0700)
committerDiane Trout <diane@caltech.edu>
Fri, 13 Apr 2012 17:57:18 +0000 (10:57 -0700)

Trivial merge