[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 19 Jul 2012 12:47:59 +0000 (18:17 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 19 Jul 2012 12:47:59 +0000 (18:17 +0530)
commit3d2dfcacfbf0e6dd8af6dc6d299fc583d24096bc
tree9976115db30af30f43a9f9f86993e6451dc5912c
parent71be1a513a30bc4b5f9c090cc2df9287da5c8dc3
parent2ad6d6a07a8dac9537716fdb654485a1b4e408b1
[MERGE]

bzr revid: apa@tinyerp.com-20120719124759-lqhpcn13osyzipqg