[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Fri, 31 Dec 2010 09:26:15 +0000 (14:56 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Fri, 31 Dec 2010 09:26:15 +0000 (14:56 +0530)
bzr revid: ara@tinyerp.com-20101231092615-a432i76llnwsovss


Trivial merge