[MRG] merge with lp:openobject-server.
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Thu, 23 Aug 2012 05:08:04 +0000 (10:38 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Thu, 23 Aug 2012 05:08:04 +0000 (10:38 +0530)
bzr revid: tpa@tinyerp.com-20120823050804-nrpewpzqtcqgl6fq

1  2 
openerp/tools/misc.py

Simple merge