Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Sun, 7 Nov 2010 23:58:07 +0000 (15:58 -0800)
committerDiane Trout <diane@caltech.edu>
Sun, 7 Nov 2010 23:58:07 +0000 (15:58 -0800)

Trivial merge