[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Mon, 9 Jan 2012 13:20:42 +0000 (14:20 +0100)
committerVo Minh Thu <vmt@openerp.com>
Mon, 9 Jan 2012 13:20:42 +0000 (14:20 +0100)
commit4e46220fae938d3ee4a614a422eba9f0acad2a99
treea7c989883af65a546408d6cbfe41639c9484caa4
parenta0d18681ee7e4a815832d4188b80062ecd87a916
parenta5fdda7481acce1c952395f50188ee89f8cd53e2
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20120109132042-z1h8t2jgrc7mrfju