At some cases, ir.model.data is left with orphan entries, so ensure that the message below is used (rather than "bool has no get()" exception). Conflicts: bin/tools/yaml_import.py bzr revid: p_christ@hol.gr-20101123153936-0cc4t4e2xwat70q1