Merge branch 'master' of github.com:catlee/tools into db_maint
Merge branch 'master' of https://github.com/catlee/tools into db_maint
Merge branch 'db_maint' of cruncher.build.mozilla.org:tools into db_maint