[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Wed, 28 Nov 2012 13:51:01 +0000 (14:51 +0100)
committerVo Minh Thu <vmt@openerp.com>
Wed, 28 Nov 2012 13:51:01 +0000 (14:51 +0100)
commit3f5635077953fd8b4511ee23d0f345632d718246
tree48a420ce1c00ffcff8ba93f4299df17d20ce9736
parent7b6ef161d285789785e9e7927be1cb7e9a1ffaf6
parent3c92e1f62bda59076807c4d024306df4e09cc1a9
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20121128135101-ko52od4hpngc9btz
openerp/cli/server.py
openerp/modules/loading.py