From: pkienzle <pkienzle@gmail.com>
Date: Fri, 14 Oct 2011 23:41:49 +0000 (-0700)
Subject: Merge pull request #2 from valhallasw/master
X-Git-Tag: v0.2~24^2~5^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=338c59e72675a01dc16bbba0091b2fc0b924b2e3;p=igor.git

Merge pull request #2 from valhallasw/master

Several commits, including fix for issue 1 (fixes #1, fixes #2)
---

338c59e72675a01dc16bbba0091b2fc0b924b2e3