SVN-Revision: 31513
SVN-Revision: 31512
Partially based on the 3.1 patches by Hartmut Knaack <knaack.h [at] gmx.de> SVN-Revision: 31474