Commit 6b22deff997b02052f4315777ca4ab4b64b8d8fe

Stefano Lattarini 2011-04-23T11:22:40

Merge branch 'maint'