[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Fri, 7 Jan 2011 09:18:43 +0000 (14:48 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Fri, 7 Jan 2011 09:18:43 +0000 (14:48 +0530)
bzr revid: ara@tinyerp.com-20110107091843-s204puwrr2du50d3


Trivial merge