Commit fd22dca159cfa10ecbb822d0dd6cc677cf333aab

Stefano Lattarini 2011-02-23T21:38:04

Merge branch 'maint'