Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Sat, 2 Apr 2011 01:18:12 +0000 (18:18 -0700)
committerDiane Trout <diane@caltech.edu>
Sat, 2 Apr 2011 01:18:12 +0000 (18:18 -0700)

Trivial merge