[Merge]Merged with trunk
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Mon, 18 Mar 2013 11:51:47 +0000 (17:21 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Mon, 18 Mar 2013 11:51:47 +0000 (17:21 +0530)
commitd9f1dbd38f44d610bcd0a2c31432c4ac77f2e667
tree26ec90e662dcd32c8ac64f660a519cee0ea17efd
parent7ba1c001491333c0ee5c6cc36728cb2ec95d9c63
parent4ce8d2697d47f5fef279985a78059e34bee6f3ba
[Merge]Merged with trunk

bzr revid: dhr@tinyerp.com-20130318115147-iif7gjyoz7nqrbp8