[MERGE]: Merged with tpa's branch.
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Wed, 29 Feb 2012 11:34:20 +0000 (17:04 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Wed, 29 Feb 2012 11:34:20 +0000 (17:04 +0530)
commit7ae5a1b83998d0e1a1446f38524ab7a94fa1d22d
treeca0e0ee1349de5367e1e0222e7efc038a836e69a
parent89020fbf6ca71f4202937a60bc1eef5b49054993
parente78fb3f0d02ea404784bdfb3d239345b48e53b5b
[MERGE]: Merged with tpa's branch.

bzr revid: uco@tinyerp.com-20120229113420-yogx1kq9dll8x16q