Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Tue, 25 Jan 2011 00:49:22 +0000 (16:49 -0800)
committerDiane Trout <diane@caltech.edu>
Tue, 25 Jan 2011 00:49:22 +0000 (16:49 -0800)

Trivial merge