[MERGE]merge with main branch.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Mon, 9 Jan 2012 12:59:18 +0000 (18:29 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Mon, 9 Jan 2012 12:59:18 +0000 (18:29 +0530)
commitc373f5b2cbfbe34d02c6226a56f00dc649c6fca9
tree1ec02d4b5c24fa3295b505c4e164b8076430aa3f
parent74bce5aa5a53f4f5a0c4ad19b971891094f17db3
parentc392fc627690ec5aa0bb394faeaa1270cf1ae3e9
[MERGE]merge with main branch.

bzr revid: vme@tinyerp.com-20120109125918-mc7iaj1z1acxjrv1