Commit a7d37f153d2f5005c73364500f9fa2bf15e2c464

Stefano Lattarini 2011-03-01T10:25:26

Merge branch 'maint'