[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Wed, 19 Sep 2012 09:15:22 +0000 (11:15 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 19 Sep 2012 09:15:22 +0000 (11:15 +0200)
commitcf27013e63aeffbb33bad790c1436e87a655aba7
treeeb145dfb7a0e5239fb6471ae99f027af6d7cf262
parentf139fc49ab799fdc57fe06611a84cc9aafee6c1d
parentcfa035e25a51fccbe4cd738d7e99526e01d9dbfa
[MERGE] from trunk

bzr revid: fva@openerp.com-20120919091522-20yc9992q5zfzwgb