[MERGE]:merged with trunk
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 24 Jul 2012 05:49:06 +0000 (11:19 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 24 Jul 2012 05:49:06 +0000 (11:19 +0530)
commit8a0615e1b5637abeebb1456f14da10d88d5d7cc9
tree1a144c4bf6662218165f5496a0b91d31d3ccd687
parent951ab38ccfe00be7f6444dacc0702a3db96da6b7
parent61f361bfee1ae021aedef0ebbf3c91d15083cf1a
[MERGE]:merged with trunk

bzr revid: apa@tinyerp.com-20120724054906-fpkmvn5gi45y9a4y