Merge branch '0.5.0.x' into 0.5.x

author Luke Dashjr <luke-jr+git@utopios.org>

Mon, 16 Apr 2012 01:06:10 +0000 (21:06 -0400)

committer Luke Dashjr <luke-jr+git@utopios.org>

Mon, 16 Apr 2012 01:06:10 +0000 (21:06 -0400)
author Luke Dashjr <luke-jr+git@utopios.org>
Mon, 16 Apr 2012 01:06:10 +0000 (21:06 -0400)
committer Luke Dashjr <luke-jr+git@utopios.org>
Mon, 16 Apr 2012 01:06:10 +0000 (21:06 -0400)
diff --cc src/bitcoinrpc.cpp
Simple merge
diff --cc src/qt/bitcoin.cpp
Simple merge
diff --cc src/qt/walletmodel.h
Simple merge
author	Luke Dashjr <luke-jr+git@utopios.org>
	Mon, 16 Apr 2012 01:06:10 +0000 (21:06 -0400)
committer	Luke Dashjr <luke-jr+git@utopios.org>
	Mon, 16 Apr 2012 01:06:10 +0000 (21:06 -0400)
		1	2
src/bitcoinrpc.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/qt/bitcoin.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/qt/walletmodel.h	patch \|	diff1 \|	diff2 \|	blob \| history