[Merge] Merge with main server.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 8 Aug 2012 04:30:38 +0000 (10:00 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 8 Aug 2012 04:30:38 +0000 (10:00 +0530)
commit9471b9f40c601cae208ef73a5edc785cb14cb149
treee5f827eb487042ed58d6c266cf0b9e69ec93242f
parentf285cc9405c286ea2fa3e980b177e5fe212c6e87
parent80dd67f65cde098e0dad6533371b43ac9456c670
[Merge] Merge with main server.

bzr revid: mdi@tinyerp.com-20120808043038-abev1s0nvbluzqv2