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

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

Mon, 22 Aug 2011 12:43:37 +0000 (14:43 +0200)

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

Mon, 22 Aug 2011 12:43:37 +0000 (14:43 +0200)
author Wladimir J. van der Laan <laanwj@gmail.com>
Mon, 22 Aug 2011 12:43:37 +0000 (14:43 +0200)
committer Wladimir J. van der Laan <laanwj@gmail.com>
Mon, 22 Aug 2011 12:43:37 +0000 (14:43 +0200)
diff --cc src/main.cpp
Simple merge
diff --cc src/util.cpp
Simple merge
diff --cc src/util.h
Simple merge
author	Wladimir J. van der Laan <laanwj@gmail.com>
	Mon, 22 Aug 2011 12:43:37 +0000 (14:43 +0200)
committer	Wladimir J. van der Laan <laanwj@gmail.com>
	Mon, 22 Aug 2011 12:43:37 +0000 (14:43 +0200)
		1	2
src/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/util.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/util.h	patch \|	diff1 \|	diff2 \|	blob \| history