[MERGE] with trunk
authorArnaud Pineux <api@openerp.com>
Thu, 6 Dec 2012 09:24:55 +0000 (10:24 +0100)
committerArnaud Pineux <api@openerp.com>
Thu, 6 Dec 2012 09:24:55 +0000 (10:24 +0100)
commita99a744148b593f00212d73acdd118684fe7c80c
tree892d762f1a1b39eb4981ddaf5045755e8bc428b8
parente7477373e9bf1a621d6b93dc2e0f46908ad40d17
parent538834d9c34e3bd54e984e8bf03953260399a22e
[MERGE] with trunk

bzr revid: api@openerp.com-20121206092455-l8cqpd4kn2ryzhxh