Commit 95b717e8bd43406afc81bc5f6ebeef8b81da970c

Stefano Lattarini 2011-02-15T10:17:53

Merge branch 'maint'