enriched trace
Merge branch 'master' of ssh://github.com/moses-smt/mosesdecoder