[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Fri, 28 Jan 2011 06:38:44 +0000 (12:08 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Fri, 28 Jan 2011 06:38:44 +0000 (12:08 +0530)
bzr revid: ara@tinyerp.com-20110128063844-3punixmhj6so4gb9


Trivial merge