[MERGE] Merge with trunk server upto revision no 3525.
authorYogesh (OpenERP) <ysa@tinyerp.com>
Fri, 5 Aug 2011 04:55:07 +0000 (10:25 +0530)
committerYogesh (OpenERP) <ysa@tinyerp.com>
Fri, 5 Aug 2011 04:55:07 +0000 (10:25 +0530)
bzr revid: ysa@tinyerp.com-20110805045507-cuw5gcj92l91y8ca


Trivial merge