Merge branch '0.4.x' into 0.5.0.x

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

Wed, 21 Mar 2012 17:19:25 +0000 (13:19 -0400)

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

Wed, 21 Mar 2012 17:19:25 +0000 (13:19 -0400)
author Luke Dashjr <luke-jr+git@utopios.org>
Wed, 21 Mar 2012 17:19:25 +0000 (13:19 -0400)
committer Luke Dashjr <luke-jr+git@utopios.org>
Wed, 21 Mar 2012 17:19:25 +0000 (13:19 -0400)
diff --cc src/db.cpp
Simple merge
diff --cc src/init.cpp
Simple merge
author	Luke Dashjr <luke-jr+git@utopios.org>
	Wed, 21 Mar 2012 17:19:25 +0000 (13:19 -0400)
committer	Luke Dashjr <luke-jr+git@utopios.org>
	Wed, 21 Mar 2012 17:19:25 +0000 (13:19 -0400)
		1	2
src/db.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/init.cpp	patch \|	diff1 \|	diff2 \|	blob \| history