[MERGE]: merging from the sam branch
authorMantavya Gajjar <mga@tinyerp.com>
Mon, 2 Nov 2009 10:17:29 +0000 (15:47 +0530)
committerMantavya Gajjar <mga@tinyerp.com>
Mon, 2 Nov 2009 10:17:29 +0000 (15:47 +0530)
commit80de59bebbc6ce922dc0af23e6f21c62114344de
tree72481c500f2e29cf754851bc52bb3c0aeef7d8cb
parente7a50c6a8f5c11adac5a2c05c6db86c5dc62bef9
parente364cf15b3c52cf04c9178f1cf53bb7591e61293
[MERGE]: merging from the sam branch

bzr revid: mga@tinyerp.com-20091102101729-jdnly7040sa9lnub