Merge branch 'master' of https://github.com/bitcoin/bitcoin

author Wladimir J. van der Laan <laanwj@gmail.com>

Sat, 6 Aug 2011 16:45:15 +0000 (18:45 +0200)

committer Wladimir J. van der Laan <laanwj@gmail.com>

Sat, 6 Aug 2011 16:45:15 +0000 (18:45 +0200)
author Wladimir J. van der Laan <laanwj@gmail.com>
Sat, 6 Aug 2011 16:45:15 +0000 (18:45 +0200)
committer Wladimir J. van der Laan <laanwj@gmail.com>
Sat, 6 Aug 2011 16:45:15 +0000 (18:45 +0200)
diff --cc src/bitcoinrpc.cpp
Simple merge
diff --cc src/init.cpp
Simple merge
diff --cc src/util.h
Simple merge
author	Wladimir J. van der Laan <laanwj@gmail.com>
	Sat, 6 Aug 2011 16:45:15 +0000 (18:45 +0200)
committer	Wladimir J. van der Laan <laanwj@gmail.com>
	Sat, 6 Aug 2011 16:45:15 +0000 (18:45 +0200)
		1	2
src/bitcoinrpc.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/init.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/util.h	patch \|	diff1 \|	diff2 \|	blob \| history