[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Wed, 11 Apr 2012 12:10:33 +0000 (17:40 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Wed, 11 Apr 2012 12:10:33 +0000 (17:40 +0530)
commitab6109416bbb0aa4799c3a9c8e4892954bcc1700
treedbed576f13e5924fd753a63f1a02e769da137f67
parentaf2fff8998321ff261ac47070fa32d4136eb67ea
parent36fddc65959502668951e179afa0b0ce955ca604
[MERGE]

bzr revid: apa@tinyerp.com-20120411121033-xi4jzlshke6682bj