[MERGE] Sync with trunk
authorJigar Amin <jam@tinyerp.com>
Tue, 20 Nov 2012 09:19:44 +0000 (14:49 +0530)
committerJigar Amin <jam@tinyerp.com>
Tue, 20 Nov 2012 09:19:44 +0000 (14:49 +0530)
bzr revid: jam@tinyerp.com-20121120091944-o59v1foebgrq4zpb


Trivial merge