Merge https://github.com/ojab/bitcoin into wx-config
authorMatt Giuca <matt.giuca@gmail.com>
Fri, 25 Feb 2011 21:45:38 +0000 (08:45 +1100)
committerMatt Giuca <matt.giuca@gmail.com>
Fri, 25 Feb 2011 21:45:38 +0000 (08:45 +1100)

Trivial merge