Merged
authorHDA (OpenERP) <hda@tinyerp.com>
Fri, 9 Apr 2010 13:01:55 +0000 (18:31 +0530)
committerHDA (OpenERP) <hda@tinyerp.com>
Fri, 9 Apr 2010 13:01:55 +0000 (18:31 +0530)
bzr revid: hda@tinyerp.com-20100409130155-reprye3m2lw9y0je


Trivial merge