Merge remote branch 'remotes/elrond/idea/db_doc'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 2 Jul 2011 22:01:43 +0000 (17:01 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 2 Jul 2011 22:01:43 +0000 (17:01 -0500)

Trivial merge