From: Charles Plessy <plessy@debian.org>
Date: Wed, 8 Jun 2011 10:40:42 +0000 (+0900)
Subject: Merge commit 'upstream/0.5'
X-Git-Tag: archive/raspbian/0.22.0+ds-1+rpi1~1^2^2~447
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ef9acd42f1bde03031bf004cb052a06161460642;p=python-pysam.git

Merge commit 'upstream/0.5'
---

ef9acd42f1bde03031bf004cb052a06161460642