Merge remote-tracking branch 'refs/remotes/rodney757/dbupdate'

Conflicts:
	mediagoblin/db/util.py
	mediagoblin/gmg_commands/dbupdate.py

diff --cc mediagoblin/gmg_commands/dbupdate.py
index 05762946c252d0a1a9e1a39b74571429c64cca7e,77eaf01d2d754e7feeab8e8b5a93329a43072673..27283a2092d7d8fd5aca552ce92420cf50de1cff
--- 1/mediagoblin/gmg_commands/dbupdate.py
--- 2/mediagoblin/gmg_commands/dbupdate.py
+++ b/mediagoblin/gmg_commands/dbupdate.py
@@@ -24,10 -24,7 +24,11 @@@ from mediagoblin.init import setup_glob
  from mediagoblin.tools.common import import_component
  
  _log = logging.getLogger(__name__)
 +logging.basicConfig()
 +## Let's not set the level as debug by default to avoid confusing users :)
 +# _log.setLevel(logging.DEBUG)
 +
+ 
  def dbupdate_parse_setup(subparser):
      pass