diff -r 6cd912702239 -r 8742f4bf029f etwist/twconfig.py
--- a/etwist/twconfig.py	Fri May 24 15:10:50 2013 +0200
+++ b/etwist/twconfig.py	Thu May 23 17:32:56 2013 +0200
@@ -28,10 +28,10 @@
 
 from os.path import join
 
-from logilab.common.configuration import Method
+from logilab.common.configuration import Method, merge_options
 
 from cubicweb.cwconfig import CONFIGURATIONS
-from cubicweb.web.webconfig import WebConfiguration, merge_options
+from cubicweb.web.webconfig import WebConfiguration
 
 
 class TwistedConfiguration(WebConfiguration):