Merge "Bug 946: Fixed eclipse errors with nagasena projects"