[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Wed, 12 Jan 2011 05:06:41 +0000 (10:36 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Wed, 12 Jan 2011 05:06:41 +0000 (10:36 +0530)
bzr revid: ara@tinyerp.com-20110112050641-fb56qoyvz0na1z91


Trivial merge