From: Diane Trout <diane@caltech.edu>
Date: Mon, 7 Feb 2011 23:53:55 +0000 (-0800)
Subject: Merge branch 'master' into debianized
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=9542f8878337dfd29d0226ae31304e4377362487

Merge branch 'master' into debianized
---

9542f8878337dfd29d0226ae31304e4377362487