[MERGE] Merge from main trunk addons
authorJMA (OpenERP) <jma@tinyerp.com>
Tue, 12 Oct 2010 11:20:22 +0000 (16:50 +0530)
committerJMA (OpenERP) <jma@tinyerp.com>
Tue, 12 Oct 2010 11:20:22 +0000 (16:50 +0530)
bzr revid: jma@tinyerp.com-20101012112022-gzfkpd10vu06ziss


Trivial merge