Commit 475fe6935b26ff42cfe7b88bd87cf0563a7c866e

Stefano Lattarini 2011-04-09T23:27:48

Merge branch 'maint'