Commit f7adc0f46ecd072da071e5d6f166988e4288285e

Stefano Lattarini 2010-11-06T20:32:48

Merge branch 'maint'