Merging revisions 7377-7378,7390-7396,7400-7405,7412-7414,7442-7443,7448-7449,7453-7456 of http://dev.e-taxonomy.eu/svn/branches/cdmlib/2.2 into trunk - test in error, see #1274, #1275
Merging revisions 7377-7378,7390-7396,7400-7405,7412-7414,7442-7443,7448-7449,7453-7456 of http://dev.e-taxonomy.eu/svn/branches/cdmlib/2.2 into trunk - test in error, see #1274, #1275