[MERGE]
authoruco <uco@tinyerp.com>
Fri, 9 Jul 2010 13:09:32 +0000 (18:39 +0530)
committeruco <uco@tinyerp.com>
Fri, 9 Jul 2010 13:09:32 +0000 (18:39 +0530)
bzr revid: uco@tinyerp.com-20100709130932-741eh719xinpkr6l


Trivial merge