[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Wed, 30 Mar 2011 15:23:01 +0000 (17:23 +0200)
committerVo Minh Thu <vmt@openerp.com>
Wed, 30 Mar 2011 15:23:01 +0000 (17:23 +0200)
commit4944140a91bb80ea7b4c585d7e2fd1fce112efb8
treec31ee8cb48e74d383d1879a296ccf77f0fc6137c
parentb247657a6a55c4c1fc6fa41744b7c1b24671718d
parentfa508cc30c668248b59b2e7e2046c50c307dcce7
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20110330152301-884qvxeg62ae633g