[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Mon, 1 Oct 2012 07:31:12 +0000 (09:31 +0200)
committerRaphael Collet <rco@openerp.com>
Mon, 1 Oct 2012 07:31:12 +0000 (09:31 +0200)
commita6e30d305c165f986665e68cf34583fed25236ca
tree5db314882bf2f4b6cee3e7b0c7cfd2f521147896
parent0d878dc99e93b61085d746456e422e73a8e23dec
parentf6ff157ca5a93331d8547e7bf53563c70257b0ef
[MERGE] from trunk

bzr revid: rco@openerp.com-20120928124403-aht90hi49yxwrcmz
bzr revid: rco@openerp.com-20121001073112-xbxdturd27bwscg1