Merge branch 'trunk' into miramerge

Compiles, not tested.

Conflicts:
	Jamroot
	OnDiskPt/PhraseNode.h
	OnDiskPt/TargetPhrase.cpp
	OnDiskPt/TargetPhrase.h
	OnDiskPt/TargetPhraseCollection.cpp
	mert/BleuScorer.cpp
	mert/Data.cpp
	mert/FeatureData.cpp
	moses-chart-cmd/src/Main.cpp
	moses/src/AlignmentInfo.h
	moses/src/ChartManager.cpp
	moses/src/LM/Ken.cpp
	moses/src/LM/Ken.h
	moses/src/LMList.h
	moses/src/LexicalReordering.h
	moses/src/PhraseDictionaryTree.h
	moses/src/ScoreIndexManager.h
	moses/src/StaticData.h
	moses/src/TargetPhrase.h
	moses/src/Word.cpp
	scripts/ems/experiment.meta
	scripts/ems/experiment.perl
	scripts/training/train-model.perl

1 files changed, 4 insertions, 0 deletions

diff --git a/mert/Jamfile b/mert/Jamfile
index e132c4f80..828d5c367 100644
--- a/mert/Jamfile
+++ b/mert/Jamfile
@@ -45,6 +45,10 @@ CderScorer.cpp
 MergeScorer.cpp
 Vocabulary.cpp
 PreProcessFilter.cpp
+SentenceLevelScorer.cpp
+Permutation.cpp
+PermutationScorer.cpp
+StatisticsBasedScorer.cpp
 ../util//kenutil m ..//z ;
 
 exe mert : mert.cpp mert_lib bleu_lib ../moses/src//ThreadPool ;