Matteo Zandi - 2007-01-25

patch to latest svn