Commit 3374fa0fcf0cce492762f5bd0d0392102ef36f21

Stefano Lattarini 2010-12-18T12:22:49

Merge branch 'maint'