[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Mon, 27 Aug 2012 09:53:59 +0000 (11:53 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Mon, 27 Aug 2012 09:53:59 +0000 (11:53 +0200)
commitf2b23b4476e10e627c60bd934f592813922e9fed
tree5b21427ca15eb47caff09bb00ab6ab422fc65bee
parent7ac661a814596911ba5826a84478a58ed1e67757
parent65f532e00137e8dc6d752449db40b737144bcb0d
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120827095359-cjz9xpu64jqy6jtd