Commit d555ae188b43938b7d1742164e9ae774382d4edd

Stefano Lattarini 2011-04-02T16:00:23

Merge branch 'maint'