Commit 1c8d96d3c8aee3c360d860fcfdefa1ba74747055

Stefano Lattarini 2011-03-04T19:10:00

Merge branch 'maint'