merge upstream
authorChristophe Simonis <chs@openerp.com>
Tue, 13 Nov 2012 10:37:56 +0000 (11:37 +0100)
committerChristophe Simonis <chs@openerp.com>
Tue, 13 Nov 2012 10:37:56 +0000 (11:37 +0100)
commit9315757fd401510761129a245737133e55900241
tree32fd1823eceaafc1d24093e9446e06e2016a3e29
parent0ec72b1ca01c1f7c31deb6646f8a9a536dfbc7a5
parent4d51fd1c02d825e2d894d339e9f1c2fb82625da7
merge upstream

bzr revid: chs@openerp.com-20121113103756-d4remxnway5hi2k8