Commit 4f43232f4dc62bd3951cb5fda2bf1933b707902e

Stefano Lattarini 2011-09-18T16:21:04

Merge branch 'maint' into java-work