From eabc5b0dde75d176e7abae4be40b68479d9ba294 Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Wed, 19 Dec 2012 18:13:08 +0100
Subject: [PATCH] [FIX]Import failed

bzr revid: dle@openerp.com-20121219171308-5sdy52hpyn9gxpv7
---
 addons/document_webdav/dav_fs.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 9f677400dd8..759d6764b47 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -39,7 +39,10 @@ except ImportError:
 import openerp
 from openerp import pooler, sql_db, netsvc
 from openerp.tools import misc
-from openerp.addons.document.dict_tools import dict_merge2
+try:
+    from tools.dict_tools import dict_merge2
+except ImportError:
+    from document.dict_tools import dict_merge2
 
 from cache import memoize
 from webdav import mk_lock_response