Commit 2bf3a3f3f7d5108b8b0c6eaa240a3b4c5d1220e7

Stefano Lattarini 2011-01-12T23:44:40

Merge branch 'maint'