[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 21 May 2012 09:05:54 +0000 (11:05 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 21 May 2012 09:05:54 +0000 (11:05 +0200)
commita788d42aa45a6c5c21f0f801bac1691d60b68bfa
tree95350e74d1d21675e4d8a5a37aec32cd2c1e8c68
parent190b959a735efd9c958445fc469593aa265e284d
parenteb163ef6903bb16d4bb11b53eae5c47515aa5f33
[merge]

bzr revid: nicolas.vanhoren@openerp.com-20120521090554-bggmrf1rczlcxw9k