Backported the following fixes from HEAD: 2004-11-12 Gonzalo Paniagua Javier <gonzalo@ximian.com> 2004-11-11 Gonzalo Paniagua Javier <gonzalo@ximian.com> 2004-11-08 Gonzalo Paniagua Javier <gonzalo@ximian.com> 2004-10-27 Gonzalo Paniagua Javier <gonzalo@ximian.com>