Commit 27d06b631ca93d1fb9fc3a21013c8fd096270d9c

Stefano Lattarini 2010-09-17T12:00:39

Merge branch 'maint'