Merge pull request #274 from iainlane/master
authorZoltan Varga <vargaz@gmail.com>
Tue, 17 Apr 2012 16:34:48 +0000 (09:34 -0700)
committerZoltan Varga <vargaz@gmail.com>
Tue, 17 Apr 2012 16:34:48 +0000 (09:34 -0700)
commit9faa3c475ed64fc49eb1716f06dd2f0bf9b62fb2
tree417a3ade7d57b0e42fa9914f542f98be5cc505f5
parent9e83a3442ec3a305dba7b142ac6fb633a158db0c
parentd6dcfb27fc6252352f6ad6f8bd9ef5cff206fd46
Merge pull request #274 from iainlane/master

Merge two smallish fixes