merged with revision 394 of svn://svn.code.sf.net/p/gsk/svn/trunk