Merge remote branch 'remotes/elrond/idea/tests_kill_db'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 12 Jun 2011 14:11:39 +0000 (09:11 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 12 Jun 2011 14:11:39 +0000 (09:11 -0500)

Trivial merge