[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 17 Apr 2012 05:59:38 +0000 (11:29 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 17 Apr 2012 05:59:38 +0000 (11:29 +0530)
commitc6bcc6d69fd7a1f8de0ad93baa642d5801b96a32
tree74cf6f5092bedf3842969db47b51219581e449e9
parentec6db09a0ed4923d8ed5d27e99709aecfaf7e065
parentdfda972285d25802a696ed4671fad515a23c2446
[MERGE]

bzr revid: apa@tinyerp.com-20120417055938-3hemnzgk63m7a2wo