Merge remote branch 'remotes/elrond/misc/add_db_field'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 23 Oct 2011 20:38:38 +0000 (15:38 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 23 Oct 2011 20:38:38 +0000 (15:38 -0500)

Trivial merge