[MERGE]: merging from the development branch 2
authorMantavya Gajjar <mga@tinyerp.com>
Mon, 26 Apr 2010 05:50:24 +0000 (11:20 +0530)
committerMantavya Gajjar <mga@tinyerp.com>
Mon, 26 Apr 2010 05:50:24 +0000 (11:20 +0530)
commit18d06cba7ee6614dc3d5bd4810578a7f0a608131
tree4d585d79628407db2a2c24d027dbbc3086dd5423
parent4b96367b11c70a5398ee603983a20c117bd345c7
parentfc30593b9a149c64340eaea49bb3ad0f30541ced
[MERGE]: merging from the development branch 2

bzr revid: mga@tinyerp.com-20100426055024-m2rugjgyspv71ucc