Commit 5fa4dafb2a0b8fc8133697526a869cecccfeceed

Stefano Lattarini 2011-01-16T20:42:31

Merge branch 'maint'