merge #4 from 2.6 branch

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

wxPython/docs/CHANGES.html

@@ -12,6 +12,9 @@
 <h1 class="title">Recent Changes for wxPython</h1>
 <div class="section" id="id1">
 <h1><a name="id1">2.6.2.1</a></h1>
+<ul class="simple">
+<li>10-Jan-2006</li>
+</ul>
 <p>wxMSW: Fix for bug #1211907, popup menu indenting inconsistent with
 bitmaps.</p>
 <p>wxMac: Don't send an event for wx.RadioButton deselections, just the

wxPython/docs/CHANGES.txt

@@ -26,6 +26,7 @@ The following deprecated items have been removed:
 
 2.6.2.1
 -------
+* 10-Jan-2006
 
 wxMSW: Fix for bug #1211907, popup menu indenting inconsistent with
 bitmaps.