Merge remote branch 'bluematt/itfix2'
authorPieter Wuille <pieter.wuille@gmail.com>
Thu, 26 May 2011 20:44:41 +0000 (22:44 +0200)
committerPieter Wuille <pieter.wuille@gmail.com>
Thu, 26 May 2011 20:44:41 +0000 (22:44 +0200)

Trivial merge