[MERGE]Merged with trunk
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Tue, 19 Mar 2013 05:22:41 +0000 (10:52 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Tue, 19 Mar 2013 05:22:41 +0000 (10:52 +0530)
commitba20af667fb5b47444129d3184d9933452c1c77f
treeb8a383487ae351184e66286b39ba1bbcfe88e107
parentd9f1dbd38f44d610bcd0a2c31432c4ac77f2e667
parentd7fbdc78d2d6155cff7942d7105385537ef16db8
[MERGE]Merged with trunk

bzr revid: dhr@tinyerp.com-20130319052241-gu7gsbshevh1qdwy