[MERGE] Merge from Parent branch
authorJay Vora (OpenERP) <jvo@tinyerp.com>
Wed, 20 Jul 2011 05:45:55 +0000 (11:15 +0530)
committerJay Vora (OpenERP) <jvo@tinyerp.com>
Wed, 20 Jul 2011 05:45:55 +0000 (11:15 +0530)
commit52529df014cda6b917706abb10c08b4813d9effe
tree12c94f444e377cea39644af7907c2dc229495a8f
parent7ae58460a920dac4098e08c13ddcbe67840a5e8f
parent75d7e67ddce08e249d54aa643e331c4f9c805591
[MERGE] Merge from Parent branch

bzr revid: jvo@tinyerp.com-20110720054555-p8vwe1miafqip7ov