Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Sat, 11 Jun 2011 00:24:52 +0000 (17:24 -0700)
committerDiane Trout <diane@caltech.edu>
Sat, 11 Jun 2011 00:24:52 +0000 (17:24 -0700)

Trivial merge