[MERGE]with latest trunk
authorHardik <hsa@tinyerp.com>
Fri, 30 Nov 2012 06:05:12 +0000 (11:35 +0530)
committerHardik <hsa@tinyerp.com>
Fri, 30 Nov 2012 06:05:12 +0000 (11:35 +0530)
commit6c3825fadd3ae8a56196859e861f67641135e10c
tree7f8ae89e4c0e1e439c50199a7daec1ed90adeec4
parent3b5d70bf3b17c9d0ab279bbdd1ee2bf7b211a450
parented6d168076891d3c7fa7966ae5de37b55e710752
[MERGE]with latest trunk

bzr revid: hsa@tinyerp.com-20121130060512-rs5rwyh37pstgu8x