[MERGE]
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Tue, 15 Feb 2011 04:45:20 +0000 (10:15 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Tue, 15 Feb 2011 04:45:20 +0000 (10:15 +0530)
commit46d759b9d889e00b4ea12af8b5e4c3a884e7a690
tree25eaf6c6661327c9a80bba25a92f7cb7ffc57e21
parent6af2f1929c84c3bb0b08d6477964b1eed5c7c46f
parenta3a7704e38a10215a907cf6a6d36d2f48b3e62cd
[MERGE]

bzr revid: uco@tinyerp.com-20110215044520-d8w2jy1xhmimtc8w