Alessio Soldano
committed
on 19 May 09
Recreating 3.1.2 branch