[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Tue, 27 Nov 2012 09:39:15 +0000 (10:39 +0100)
committerRaphael Collet <rco@openerp.com>
Tue, 27 Nov 2012 09:39:15 +0000 (10:39 +0100)
commit36059c6ffe49b9f291570b76c3519af8fe760c63
treea070b99f08f783926f8a05591969b7bac86a05b4
parentff4e9c7e2ccbf36f3cd676d0588cf90c736a1e16
parente6d033755f897b741f09bc1ab15e355d495ea73c
[MERGE] from trunk

bzr revid: rco@openerp.com-20121127093915-6zupyre5jh2fxfd7