[MERGE] YAML: Support m2o None value, courtesy of Dmitrijs Ledkovs (credativ)

bzr revid: odo@openerp.com-20111124153233-4vpb6k1c3ksllsfd

diff --cc openerp/tools/yaml_import.py
index e0ced74,0ec52a9..8c00f81
--- 1/openerp/tools/yaml_import.py
--- 2/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@@ -166,11 -164,11 +166,11 @@@ class YamlInterpreter(object)
              self.logger.log(logging.ERROR, 'id: %s is to long (max: 64)', id)
  
      def get_id(self, xml_id):
-         if xml_id is False:
 -        if xml_id == None:
 -            return None
 -        if not xml_id:
 -            raise YamlImportException("The xml_id should be a non empty string.")
 -        if isinstance(xml_id, types.IntType):
++        if xml_id is False or xml_id is None:
 +            return False
 +        #if not xml_id:
 +        #    raise YamlImportException("The xml_id should be a non empty string.")
 +        elif isinstance(xml_id, types.IntType):
              id = xml_id
          elif xml_id in self.id_map:
              id = self.id_map[xml_id]