[galaxy-commits] commit/galaxy-central: Dave Bouvier: Cleanup after merge conflict.