[MERGE]merged with trunk
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Thu, 28 Feb 2013 07:03:32 +0000 (12:33 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Thu, 28 Feb 2013 07:03:32 +0000 (12:33 +0530)
commitfba7d98e59823e76ff7da344ece85104407041ed
tree7c46a28adac674831433b6d8027782d7182d4996
parent2154cdbd066596cb1b3f555317331433e7e2b277
parent675b8eb1dcf91460703fab8af7593256b18d8244
[MERGE]merged with trunk

bzr revid: dhr@tinyerp.com-20130228070332-bywyhdrj335edd7w