[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Wed, 5 Jan 2011 05:55:21 +0000 (11:25 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Wed, 5 Jan 2011 05:55:21 +0000 (11:25 +0530)
bzr revid: ara@tinyerp.com-20110105055521-2925o70tv4heoesf


Trivial merge