[MERGE]: Merged with trunk addons.
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Fri, 9 Mar 2012 10:39:29 +0000 (16:09 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Fri, 9 Mar 2012 10:39:29 +0000 (16:09 +0530)
commit3a3959530b349010585501e3829a08f773c3055f
treedd2935cc09632b37ca52aa99e9a5d1df44fda322
parent96b40be14928520322c868f66c9b5503e9db6580
parentabfa7ea5559caa2ecf224cc27cf5b80ea616ceee
[MERGE]: Merged with trunk addons.

bzr revid: uco@tinyerp.com-20120309103929-sm3d8wh2vmde9rhb