[MERGE]merged with trunk
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Fri, 1 Feb 2013 06:55:01 +0000 (12:25 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Fri, 1 Feb 2013 06:55:01 +0000 (12:25 +0530)
commit6f5c35ba6c9c185e0dfecfa3e4cfb7c9ff7af11b
tree580b2faf882cc690b374ce8e7cf6dabbbc3a1a0c
parent3c1fdb38db0df3b5d110232d815640de893438c3
parent1e715c82431a1d01730e66383eef50ae67856999
[MERGE]merged with trunk

bzr revid: dhr@tinyerp.com-20130201054352-se7iuxpmgmd2s1zf
bzr revid: dhr@tinyerp.com-20130201065501-4g76556uhorpvv4o