Commit 8d21bc19ee310898e5823e00de04add96f66c9b3

Stefano Lattarini 2011-04-15T17:08:06

Merge branch 'maint'