From: Diane Trout <diane@caltech.edu>
Date: Fri, 19 Nov 2010 19:43:44 +0000 (-0800)
Subject: Merge commit 'upstream/0.3'
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=pysam.git;a=commitdiff_plain;h=70e0c1963e5f83b0a6ab2aa139e1a8f30aa25c56

Merge commit 'upstream/0.3'
---

70e0c1963e5f83b0a6ab2aa139e1a8f30aa25c56