Merge from trunk
authorMinh Tran <mit@openerp.com>
Wed, 11 Jan 2012 11:08:03 +0000 (12:08 +0100)
committerMinh Tran <mit@openerp.com>
Wed, 11 Jan 2012 11:08:03 +0000 (12:08 +0100)
commitce2202a823b1469c50412bbbe7b8bfda04b0718b
tree163b7eaac8f7a596f015eec8098ac7d4d33862cb
parentd63c20b73de27d5b272ce8b1442044cc8d5fbb93
parent2b736ee2cf2037734fd426bd968b6294a7a843e4
Merge from trunk

bzr revid: mit@openerp.com-20120111110803-pcizwc2x9w51tsdx