[MRG] merge with main branch
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Thu, 1 Mar 2012 05:47:24 +0000 (11:17 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Thu, 1 Mar 2012 05:47:24 +0000 (11:17 +0530)
commitfffaed555c0fa8c5df5636a6bd4efb49ef569cde
tree6ed070c3361356f76f6d2bf141de930f25217a11
parentdc51d369f8ca17c6138b88a441514a4c5ee8e51e
parente71848cee408b729538d7dc076e4c655ffdbb736
[MRG] merge with main branch

bzr revid: tpa@tinyerp.com-20120301054724-g2fwea0letkcn8cl