[MRG] merge with main barnch
authorAmit Vora <avo@tinyerp.com>
Fri, 25 Apr 2014 11:52:39 +0000 (17:22 +0530)
committerAmit Vora <avo@tinyerp.com>
Fri, 25 Apr 2014 11:52:39 +0000 (17:22 +0530)
bzr revid: avo@tinyerp.com-20140423054749-ubsch2zyr0e0617l
bzr revid: avo@tinyerp.com-20140425115239-w1j8zg1dp0ibzn0a


Trivial merge