[MERGE] trunk
authorFabien Meghazi <fme@openerp.com>
Wed, 5 Dec 2012 16:08:08 +0000 (17:08 +0100)
committerFabien Meghazi <fme@openerp.com>
Wed, 5 Dec 2012 16:08:08 +0000 (17:08 +0100)
commit6562cc3d187df48daf5046ba1ec0c27b8b3227c8
tree1ac1bfb1836a35575da4e36eda259f7fbc845d8c
parentbf6bdf017bc67a2ada06826a33a12b50a029a608
parent0c3f9f691b36143bd0efd2f7f683c2a35b76ad09
[MERGE] trunk

bzr revid: fme@openerp.com-20121205160808-7zd3c6y6pm26pj47