[MERGE] trunk.
authorParamjit Singh Sahota <psa@tinyerp.com>
Fri, 8 Mar 2013 07:22:54 +0000 (12:52 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Fri, 8 Mar 2013 07:22:54 +0000 (12:52 +0530)
bzr revid: psa@tinyerp.com-20130308072254-w759r51n1s1dga5i


Trivial merge