From 6b44ceb65f6e6cf92c800b65eb503c209768e2be Mon Sep 17 00:00:00 2001
From: David Webster <Dave.Webster@bhmi.com>
Date: Tue, 28 Mar 2000 05:13:00 +0000
Subject: [PATCH] Merge between dev and stable

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775