Merge branch 'common_services'
[ptas] / zouba / configure-stamp