remove inner class to deal with http://jira.codehaus.org/browse/GRECLIPSE-1519
Merge branch '2.0.x' into 2.1.x