[MERGE]merge with parent branch
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Fri, 22 Jun 2012 06:04:49 +0000 (11:34 +0530)
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Fri, 22 Jun 2012 06:04:49 +0000 (11:34 +0530)
commit6aea583ad9b8a88b30f390dc59f518dc05141e68
tree62c30b527735f589c306994476cc273fa45917c1
parent4c2541d7a363a372cf7c08e5c3bc14da8a7fc8f5
parentbbdbb9dd6b84bcdef34e7782432064d88fbe466f
[MERGE]merge with parent branch

bzr revid: sgo@tinyerp.com-20120622060449-pvqgprokiizsqv8m