[MERGE]:Merged from trunk
authorapa-tiny <apa@tinyerp.com>
Thu, 16 Sep 2010 12:25:04 +0000 (17:55 +0530)
committerapa-tiny <apa@tinyerp.com>
Thu, 16 Sep 2010 12:25:04 +0000 (17:55 +0530)
commit33a2563db61538c64c30c3a9ccbfbb8511d2bcea
treebe8ad3fabe6cabca5ff1091b21c3baa1bacbbd64
parent96b3dc9cb7ec4b90af44a057659aa2512f8ff64d
parentf4d26a7016d1df7af8ecc682237047f2b0a47c65
[MERGE]:Merged from trunk

bzr revid: apa@tinyerp.com-20100916122504-y7d51oacgt8sbu20