[MERGE]merge with latest trunk
authorCedric Snauwaert <csn@openerp.com>
Fri, 9 Nov 2012 13:59:28 +0000 (14:59 +0100)
committerCedric Snauwaert <csn@openerp.com>
Fri, 9 Nov 2012 13:59:28 +0000 (14:59 +0100)
commit7b06337574880e609fbb13543eb578eabda93b1a
treeb4393caecefee7434144673ba3f1bded5572a90f
parentd9df10a6c474411d80f772e7924077157fe806de
parent0a7d680313f7cb5f92f28a0fef33bc61a1a26de6
[MERGE]merge with latest trunk

bzr revid: csn@openerp.com-20121109135928-45rir9rehmvaf6tp