[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Mon, 19 Mar 2012 09:21:42 +0000 (10:21 +0100)
committerRaphael Collet <rco@openerp.com>
Mon, 19 Mar 2012 09:21:42 +0000 (10:21 +0100)
bzr revid: rco@openerp.com-20120319092142-bk2yjoao67g712nb

1  2 
openerp/osv/fields.py

Simple merge