Commit a71a5686d83f58b2f50f1fc8b4b005a61d8ab127

Stefano Lattarini 2011-01-09T15:30:42

Merge branch 'maint'