[MRG] merge with main branch
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 18 Apr 2012 09:29:33 +0000 (14:59 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 18 Apr 2012 09:29:33 +0000 (14:59 +0530)
commitbc78bf45a02b985c41bb5d71fa0c07f397121f8f
treec6576fcddd56b4156534766fb0ee94afdef912e8
parentaca7ed80a5a00f6034fa774b63d83c51f17a34a5
parentea3f6f17f5d0b0465f7e8cd77fb78b6b2740547d
[MRG] merge with main branch

bzr revid: tpa@tinyerp.com-20120418092933-1t03mzmjb6nmnmal