[MERGE] Merged main branch
authorDHS (OpenERP) <dhs@tinyerp.com>
Tue, 26 Oct 2010 09:34:36 +0000 (15:04 +0530)
committerDHS (OpenERP) <dhs@tinyerp.com>
Tue, 26 Oct 2010 09:34:36 +0000 (15:04 +0530)
bzr revid: dhs@tinyerp.com-20101026093436-lxntznhfikv09akv


Trivial merge