Merge remote branch 'upstream/master'
authorPieter Wuille <pieter.wuille@gmail.com>
Thu, 2 Jun 2011 14:17:37 +0000 (16:17 +0200)
committerPieter Wuille <pieter.wuille@gmail.com>
Thu, 2 Jun 2011 14:17:37 +0000 (16:17 +0200)

Trivial merge