[MERGE]Latest trunk
authordle@openerp.com <>
Mon, 17 Dec 2012 13:33:43 +0000 (14:33 +0100)
committerdle@openerp.com <>
Mon, 17 Dec 2012 13:33:43 +0000 (14:33 +0100)
commit4428c678395577c938433e060db6a3f969c95d5a
treed0745353c732c62a6c1b72f6e94549b32df3332c
parentc45b4dc8ac4e90e00105e411b4802d4b098aa701
parentd7461fb1c813590d70ddecaeff65c02a1029d61b
[MERGE]Latest trunk

bzr revid: dle@openerp.com-20121217133343-ki5ib7fszlmpu2i3