X-SVN-Rev: 9466
Remove duplicates. Fix malformed data. Add some missing data. and so on. X-SVN-Rev: 7530
X-SVN-Rev: 6214