[MERGE] from trunk
authorChristophe Matthieu <chm@openerp.com>
Wed, 19 Dec 2012 14:40:55 +0000 (15:40 +0100)
committerChristophe Matthieu <chm@openerp.com>
Wed, 19 Dec 2012 14:40:55 +0000 (15:40 +0100)
commit1af40b9b78f438bd54e8adbe474c05a17211c8fc
treec2262303e00c2fd579c6dc6af0fdd3bd8e89d318
parentbf115734369b185cd3d979245de65276fd885bcb
parent777ed1e0dc9b49a2b55c1f1a8260c07f46a7bacb
[MERGE] from trunk

bzr revid: chm@openerp.com-20121219144055-up3kamlh08nbk1ju