[MERGE]
authorStephane Wirtel <stw@openerp.com>
Mon, 3 Oct 2011 12:22:14 +0000 (14:22 +0200)
committerStephane Wirtel <stw@openerp.com>
Mon, 3 Oct 2011 12:22:14 +0000 (14:22 +0200)
commit0a2e18104c6db203facd59422d6da8b2fd4eee6a
tree5c06c55d0fe542e3ae042abc443f29a5de9c2e86
parent29337910dfa1ce13d1201b79453f395346d9a380
parent608274e2926e0463d6c849e60755738ff880b23c
[MERGE]

bzr revid: stw@openerp.com-20111003122214-mvattq2d8y1i66aw