Merge remote-tracking branch 'remotes/gandaro/wipealldata-from-db_name'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 24 Mar 2012 14:58:26 +0000 (09:58 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 24 Mar 2012 14:58:26 +0000 (09:58 -0500)

Trivial merge