diff -r 6cd912702239 -r 8742f4bf029f web/webconfig.py
--- a/web/webconfig.py	Fri May 24 15:10:50 2013 +0200
+++ b/web/webconfig.py	Thu May 23 17:32:56 2013 +0200
@@ -28,10 +28,11 @@
 
 from logilab.common.decorators import cached, cachedproperty
 from logilab.common.deprecation import deprecated
+from logilab.common.configuration import merge_options
 
 from cubicweb import ConfigurationError
 from cubicweb.toolsutils import read_config
-from cubicweb.cwconfig import CubicWebConfiguration, register_persistent_options, merge_options
+from cubicweb.cwconfig import CubicWebConfiguration, register_persistent_options
 
 
 register_persistent_options( (