Merge from trunk
authorMinh Tran <mit@openerp.com>
Wed, 11 Jan 2012 12:24:21 +0000 (13:24 +0100)
committerMinh Tran <mit@openerp.com>
Wed, 11 Jan 2012 12:24:21 +0000 (13:24 +0100)
commitee54da8b9026b51cdfbcff0bddd90a700915403d
treea2388d746f2c52eaa250f015d650d08dede5b30b
parent0d64d9940dfc6de2c7177aa420f08a4feced8ff5
parent37f923fb0ff4a3d14510e438ef0eddf7413f3d6d
Merge from trunk

bzr revid: mit@openerp.com-20120111122421-5mywxemtnp0e7an8