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

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

Thu, 11 Aug 2011 08:17:21 +0000 (10:17 +0200)

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

Thu, 11 Aug 2011 08:17:21 +0000 (10:17 +0200)
author Wladimir J. van der Laan <laanwj@gmail.com>
Thu, 11 Aug 2011 08:17:21 +0000 (10:17 +0200)
committer Wladimir J. van der Laan <laanwj@gmail.com>
Thu, 11 Aug 2011 08:17:21 +0000 (10:17 +0200)
diff --cc src/main.cpp
Simple merge
diff --cc src/serialize.h
Simple merge
author	Wladimir J. van der Laan <laanwj@gmail.com>
	Thu, 11 Aug 2011 08:17:21 +0000 (10:17 +0200)
committer	Wladimir J. van der Laan <laanwj@gmail.com>
	Thu, 11 Aug 2011 08:17:21 +0000 (10:17 +0200)
		1	2
src/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/serialize.h	patch \|	diff1 \|	diff2 \|	blob \| history