[MERGE] Merge from trunk server
authorMustufa Rangwala (OpenERP) <mra@tinyerp.com>
Tue, 16 Aug 2011 09:14:05 +0000 (14:44 +0530)
committerMustufa Rangwala (OpenERP) <mra@tinyerp.com>
Tue, 16 Aug 2011 09:14:05 +0000 (14:44 +0530)
bzr revid: mra@tinyerp.com-20110816091405-4d67naioc3sftp0r


Trivial merge