Updated to the latest stable (trunk in subversion)