[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Mon, 3 Jan 2011 09:36:18 +0000 (15:06 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Mon, 3 Jan 2011 09:36:18 +0000 (15:06 +0530)
bzr revid: ara@tinyerp.com-20110103093618-byyb6byysarfykrf


Trivial merge