[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Tue, 8 Jan 2013 17:52:16 +0000 (18:52 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 8 Jan 2013 17:52:16 +0000 (18:52 +0100)
commit86b7bdeed025cb2acd0150b998a56ced81b005d5
tree21afae2267b31484d9d13be925f2a5699c2f1080
parente40eeedf3e366254dea4a4a0101efe557aaac7a2
parentb9a182ff1aecdd5000605ee443a74b5e07a351ff
[MERGE] from upstream

bzr revid: fva@openerp.com-20130108175216-qsvgflz81jur21vu