Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Sat, 18 Jun 2011 20:31:03 +0000 (13:31 -0700)
committerDiane Trout <diane@caltech.edu>
Sat, 18 Jun 2011 20:31:03 +0000 (13:31 -0700)

Trivial merge