Merge pull request #1022 from Diapolo/fix#1020
authorPieter Wuille <pieter.wuille@gmail.com>
Mon, 2 Apr 2012 14:08:14 +0000 (07:08 -0700)
committerPieter Wuille <pieter.wuille@gmail.com>
Mon, 2 Apr 2012 14:08:14 +0000 (07:08 -0700)
fix for #1020


Trivial merge