Initial import from codehaus svn repo
Merge branch 'origin/codehaus'