diff --git a/wxPython/src/__version__.py b/wxPython/src/__version__.py
index 7c2915a57b..c2c3ae5c85 100644
--- a/wxPython/src/__version__.py
+++ b/wxPython/src/__version__.py
@@ -1,10 +1,10 @@
 # This file was generated by setup.py...
 
-wxVERSION_STRING  = '2.4.1.1p1'
+wxVERSION_STRING  = '2.4.1.0p1'
 wxMAJOR_VERSION   = 2
 wxMINOR_VERSION   = 4
 wxRELEASE_VERSION = 1
-wxSUBREL_VERSION  = 1
+wxSUBREL_VERSION  = 0
 
 wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_VERSION,
              wxSUBREL_VERSION, 'p1')
diff --git a/wxPython/src/_extras.py b/wxPython/src/_extras.py
index ae21407d38..035429c786 100644
--- a/wxPython/src/_extras.py
+++ b/wxPython/src/_extras.py
@@ -774,6 +774,34 @@ class _wxPyDeadObject:
     def __nonzero__(self):
         return 0
 
+#----------------------------------------------------------------------
+
+class wxNotebookPage(wxPanel):
+    """
+    There is an old (and apparently unsolvable) bug when placing a
+    window with a nonstandard background colour in a wxNotebook, as
+    the notbooks's background colour would always be used when the
+    window is refreshed.  The solution is to place a panel in the
+    notbook and the coloured window o nthe panel, sized to cover the
+    panel.  This simple class does that for you, just put an instance
+    of this in the notebook and make your regular window a child of
+    this one and it will handle the resize for you.
+    """
+    def __init__(self, parent, id=-1,
+                 pos=wxDefaultPosition, size=wxDefaultSize,
+                 style=wxTAB_TRAVERSAL, name="panel"):
+        wxPanel.__init__(self, parent, id, pos, size, style, name)
+        self.child = None
+        EVT_SIZE(self, self.OnSize)
+    def OnSize(self, evt):
+        if self.child is None:
+            children = self.GetChildren()
+            if len(children):
+                self.child = children[0]
+        if self.child:
+            self.child.SetPosition((0,0))
+            self.child.SetSize(self.GetSize())
+
 
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index 47188ebb23..7d4f87d2c7 100644
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -652,7 +652,7 @@ public:
     bool LoadPage(const wxString& location);
 
     // Loads HTML page from file
-//TODO    bool LoadFile(const wxString& filename);
+    bool LoadFile(const wxString& filename);
 
     // Append to current page
     bool AppendToPage(const wxString& source);