From 8ab1e32a479c018766f330ecf71670ef71492300 Mon Sep 17 00:00:00 2001
From: mike <michael.jmontcalm@gmail.com>
Date: Wed, 15 Apr 2009 02:55:10 +0000
Subject: Merge commit 'origin/lp349874'

Conflicts:

	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/actiontests.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/filterstests.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/gtkutilstests.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py
---
(limited to 'src/sugar/tutorius/tests/filterstests.py')

diff --git a/src/sugar/tutorius/tests/filterstests.py b/src/sugar/tutorius/tests/filterstests.py
index 4b7ae61..8ee6cc8 100644
--- a/src/sugar/tutorius/tests/filterstests.py
+++ b/src/sugar/tutorius/tests/filterstests.py
@@ -26,7 +26,7 @@ import time
 import gobject
 import gtk
 
-from sugar.tutorius.filters import EventFilter, TimerEvent, GtkWidgetEventFilter
+from sugar.tutorius.filters import EventFilter, TimerEvent, GtkWidgetEventFilter, GtkWidgetTypeFilter
 from gtkutilstests import SignalCatcher
 
 class BaseEventFilterTests(unittest.TestCase):
--
cgit v0.9.1