[MERGE]merge with latest addons
authorCedric Snauwaert <csn@openerp.com>
Thu, 13 Dec 2012 08:38:37 +0000 (09:38 +0100)
committerCedric Snauwaert <csn@openerp.com>
Thu, 13 Dec 2012 08:38:37 +0000 (09:38 +0100)
commite858c8647cb99eb66d90ef42e4d61c1831bd909e
treee7bb7a2b547e9994d7a40617123731ee6cd4da2d
parent182ea633d76d42fc1dbc611029012b5194d75e1a
parentd6ea61789fda4d49eabde2a9e97fbea42a6e68c3
[MERGE]merge with latest addons

bzr revid: csn@openerp.com-20121213083837-wsr74knpgeqou3mv