[MERGE] merge with main branch
authorKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Thu, 7 Jun 2012 05:23:24 +0000 (10:53 +0530)
committerKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Thu, 7 Jun 2012 05:23:24 +0000 (10:53 +0530)
commitaf1e846437f7b7949f11c009def3bf99fb335333
tree6fe09b718518d46260896649531d8f4e24ef75b3
parent0a2146ebb3e620e7a29c9a62610d27a71a33cd60
parent07b3f4083b496a9beb797906c54e6f30c0fa3e19
[MERGE] merge with main branch

bzr revid: kjo@tinyerp.com-20120607052324-v5ie48mx5dng0409