[MERGE]Latest trunk
authordle@openerp.com <>
Tue, 18 Dec 2012 08:51:21 +0000 (09:51 +0100)
committerdle@openerp.com <>
Tue, 18 Dec 2012 08:51:21 +0000 (09:51 +0100)
commit004096187b22211b2112f504bfc3df76e6c03fd3
treea329e567665cb139102b20281a41182a1d6936f0
parent09a4a59eb8599f9153b30f49427a003905358ecb
parentb2bb3eafbdde0ef857ac02be88203b107a437a81
[MERGE]Latest trunk

bzr revid: dle@openerp.com-20121218085121-e1f6ziqvemkmnszg