[MERGE]:Merged from trunk
authorapa-tiny <apa@tinyerp.com>
Mon, 13 Sep 2010 04:45:36 +0000 (10:15 +0530)
committerapa-tiny <apa@tinyerp.com>
Mon, 13 Sep 2010 04:45:36 +0000 (10:15 +0530)
commit2fca7bd6e2003e5aaf3788781718472f1db5d0c5
tree37e584e4eea3d1693f7d286d5fe66e06f99bb8a9
parentff3447d9cb85e3df9e96948562fe8b099a8d2180
parent6eaec834d956caa04702f454088051fe56360563
[MERGE]:Merged from trunk

bzr revid: apa@tinyerp.com-20100913044536-764w7oer6277bkll