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, 6 insertions, 2 deletions

diff --git a/mert/FeatureStats.cpp b/mert/FeatureStats.cpp
index 834b63b4c..22f62e234 100644
--- a/mert/FeatureStats.cpp
+++ b/mert/FeatureStats.cpp
@@ -22,6 +22,10 @@ namespace {
 const int kAvailableSize = 8;
 } // namespace
 
+namespace MosesTuning
+{
+  
+
 SparseVector::name2id_t SparseVector::m_name_to_id;
 SparseVector::id2name_t SparseVector::m_id_to_name;
 
@@ -294,7 +298,6 @@ ostream& operator<<(ostream& o, const FeatureStats& e)
   return o;
 }
 
-//ADEED_BY_TS
 bool operator==(const FeatureStats& f1, const FeatureStats& f2) {
   size_t size = f1.size();
 
@@ -308,4 +311,5 @@ bool operator==(const FeatureStats& f1, const FeatureStats& f2) {
 
   return true;
 }
-//END_ADDED
+
+}