Commit 98d4fcff80f6cee71067be96f19cafd30c0e005f

Stefano Lattarini 2010-10-05T17:29:39

Merge branch 'maint'