Merge commit 'v0.5.0rc3'
authorPieter Wuille <pieter.wuille@gmail.com>
Tue, 8 Nov 2011 13:21:58 +0000 (14:21 +0100)
committerPieter Wuille <pieter.wuille@gmail.com>
Tue, 8 Nov 2011 13:22:18 +0000 (14:22 +0100)

Trivial merge