Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorroot <root@jumpgate.caltech.edu>
Tue, 25 Jan 2011 00:48:46 +0000 (16:48 -0800)
committerroot <root@jumpgate.caltech.edu>
Tue, 25 Jan 2011 00:48:46 +0000 (16:48 -0800)

Trivial merge