[MERGE]
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Wed, 2 Feb 2011 04:45:27 +0000 (10:15 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Wed, 2 Feb 2011 04:45:27 +0000 (10:15 +0530)
bzr revid: uco@tinyerp.com-20110202044527-m61qnov3aspijdrn


Trivial merge