Commit 9393a25995d4bbedc5103cce3e7dd9a7dd39e8d6

Stefano Lattarini 2011-09-19T18:24:44

Merge branch 'fix-java-prefix-is-unexpected' into maint