[MERGE]Latest trunk
authordle@openerp.com <>
Thu, 29 Nov 2012 17:03:52 +0000 (18:03 +0100)
committerdle@openerp.com <>
Thu, 29 Nov 2012 17:03:52 +0000 (18:03 +0100)
commit6f0fdd4ad01ff987d47a96bd54d66a7540335664
treec77fc23513272b8f3227f01f046726e048ba7c6a
parent8acb5e3d4a93fe61be2fb13a82d1f5165f0b27e6
parent720f9093bcfff0996764e655a5b48bfa51062682
[MERGE]Latest trunk

bzr revid: dle@openerp.com-20121129170352-m8hpklzkuhbfxvev