[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Wed, 4 Jan 2012 12:57:30 +0000 (13:57 +0100)
committerRaphael Collet <rco@openerp.com>
Wed, 4 Jan 2012 12:57:30 +0000 (13:57 +0100)
commit91ebc126ddefffd2a24d031d8d774c2ca451e316
tree9ed8f8d70eca75cf5f35c6cc9a3cf50a519a7e28
parenta987cc38a9836cc02d0590efaf5c91a90dfd3f1b
parent2ed427b5db647305a9776de17180665d567584ef
[MERGE] from trunk

bzr revid: rco@openerp.com-20120104125730-j2j7jhiwhmthssi8