Merge with trunk-server
authorYogesh Sakhreliya <ysa@tinyerp.com>
Wed, 29 Dec 2010 07:43:50 +0000 (13:13 +0530)
committerYogesh Sakhreliya <ysa@tinyerp.com>
Wed, 29 Dec 2010 07:43:50 +0000 (13:13 +0530)
bzr revid: ysa@tinyerp.com-20101229074350-vk1xbgjqgsj71y8y


Trivial merge