Commit c408beafae2ab5909bfd8b04df1ca93aedc6b5e7

Stefano Lattarini 2011-04-10T15:37:23

Merge branch 'maint'