[MERGE] Merged main branch
authorDHS (OpenERP) <dhs@tinyerp.com>
Tue, 26 Oct 2010 07:16:33 +0000 (12:46 +0530)
committerDHS (OpenERP) <dhs@tinyerp.com>
Tue, 26 Oct 2010 07:16:33 +0000 (12:46 +0530)
bzr revid: dhs@tinyerp.com-20101026071633-v9t8xjhwx71i4zwo


Trivial merge