Merge branch 'configdb' of ssh://git.citadel.org/appl/gitroot/citadel