[MERGE]Latest trunk
authorMartin Trigaux <mat@openerp.com>
Mon, 4 Mar 2013 11:27:59 +0000 (12:27 +0100)
committerMartin Trigaux <mat@openerp.com>
Mon, 4 Mar 2013 11:27:59 +0000 (12:27 +0100)
bzr revid: mat@openerp.com-20130304112759-ccsvmxd2jk1jvsrx


Trivial merge