[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Jul 2012 04:57:02 +0000 (10:27 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Jul 2012 04:57:02 +0000 (10:27 +0530)
commitf9372111f6c22e9c3984a9f112d2cf7f5d74b309
treec9c94508e79a56dce7681643844b88c0a39a6f09
parent6c3d0b2c8e1f50dc239ca22998248a5105739816
parent4f15336078c3fc2e50a69ed0fc78ac54ac65cd97
[MERGE]

bzr revid: apa@tinyerp.com-20120730045702-k1b2vjivuyzpabfs