[MERGE] Minor bugfixes (missing imports, etc.) courtesy of Florent Xicluna

bzr revid: odo@openerp.com-20120214150022-yx6zi0j4fr2d48uc

diff --cc openerp/addons/base/ir/ir_ui_view.py
index 6c9463b,54b6879..8fcb794
--- 1/openerp/addons/base/ir/ir_ui_view.py
--- 2/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@@ -125,8 -125,8 +125,6 @@@ class view(osv.osv)
          return result
  
      def graph_get(self, cr, uid, id, model, node_obj, conn_obj, src_node, des_node, label, scale, context=None):
--        if not label:
-             label = []
 -            label = '[]'
          nodes=[]
          nodes_name=[]
          transitions=[]