Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Wed, 1 Aug 2012 23:19:50 +0000 (16:19 -0700)
committerDiane Trout <diane@caltech.edu>
Wed, 1 Aug 2012 23:19:50 +0000 (16:19 -0700)

Trivial merge