Commit 30eb17ff6ebb7d3c3904f7f65ded96a9568dbcd7

Stefano Lattarini 2011-10-06T21:42:06

Merge branch 'maint'