[MERGE]: Merged with tpa's branch.
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Wed, 29 Feb 2012 12:35:03 +0000 (18:05 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Wed, 29 Feb 2012 12:35:03 +0000 (18:05 +0530)
commit909b86cfc378ffec561f271c47e6018975ddf291
tree7f681e6b191ef2fbd86d9ba2911effa12979103e
parentb8b535fcaad523687d89fc4c322557054c262ea5
parent598526cbc83fe5a0292f0a05367005ac4c50da49
[MERGE]: Merged with tpa's branch.

bzr revid: uco@tinyerp.com-20120229123503-y9czl9nnpuf47ppl