test multi-user
Merge branch 'master' of xilp.github.com:xilp/cost into develop