[MERGE] Merge
authorHiral Patel (OpenERP) <hip@tinyerp.com>
Mon, 29 Oct 2012 11:06:04 +0000 (16:36 +0530)
committerHiral Patel (OpenERP) <hip@tinyerp.com>
Mon, 29 Oct 2012 11:06:04 +0000 (16:36 +0530)
commit0172bc45cabfefffb6c083fb1fd7b29fbf05d990
treec8f48ffd00d4812c17119984dcfbd5c4d38855f9
parenta29d6456a87e9c57728016b9526c3a2324b9321a
parent8dbbbcaca2db590a146594dc4ae315abd4e70ad0
[MERGE] Merge

bzr revid: hip@tinyerp.com-20121029110604-6tku7zgtmeosd494