Commit 3dffb015de25fc5cd79134feb9b94cbc8a3f4994

Stefano Lattarini 2010-11-07T15:23:41

Merge branch 'maint'