[MERGE]
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Wed, 11 Apr 2012 12:12:28 +0000 (17:42 +0530)
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Wed, 11 Apr 2012 12:12:28 +0000 (17:42 +0530)
commite1ff635d2214158915db30a3e1d8cb7021badc4b
treedbed576f13e5924fd753a63f1a02e769da137f67
parent36fddc65959502668951e179afa0b0ce955ca604
parentab6109416bbb0aa4799c3a9c8e4892954bcc1700
[MERGE]

bzr revid: sgo@tinyerp.com-20120411121228-1f2z1gsvthobyf3j