[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Jul 2012 05:28:09 +0000 (10:58 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Jul 2012 05:28:09 +0000 (10:58 +0530)
commit5aee509a3b7585e32e1273e1925d1d25762e89fe
treed6b494809e2d1eab9e8a9553fe4984eba9b79cb3
parentff71d6d1ade22e9e1299f81a6a05043466de26ba
parent9128e37231194592b6468ffa7922bbb39b5d7a33
[MERGE]

bzr revid: apa@tinyerp.com-20120727052809-oezzaxn0qikgtkli