Merge lp:~openerp-dev/openobject-server/6.0-bug-793106-xrg into lp:openobject-server/6.0

[xrg]

=== modified file 'bin/tools/yaml_import.py'
--- bin/tools/yaml_import.py	2011-01-04 10:13:35 +0000
+++ bin/tools/yaml_import.py	2011-06-05 11:40:51 +0000
@@ -106,7 +106,7 @@
             success += self._report[severity][True]
             failure += self._report[severity][False]
         res.append("total\t%s\t%s" % (success, failure))
-        res.append("end of report (%s assertion(s) checked)" % success + failure)
+        res.append("end of report (%s assertion(s) checked)" % (success + failure))
         return "\n".join(res)
 
 class RecordDictWrapper(dict):