[MERGE]merge with trunk
authorCedric Snauwaert <csn@openerp.com>
Mon, 22 Oct 2012 08:28:53 +0000 (10:28 +0200)
committerCedric Snauwaert <csn@openerp.com>
Mon, 22 Oct 2012 08:28:53 +0000 (10:28 +0200)
commit505bf5536197bcbc08404b909f56f23523e5ff85
tree34c6a5cf74371f9bf18d9fe11e20291c6aee4bbc
parent17aca9c95ffea1aebd45f7ad6564286215652291
parentf6722a220cbf2ca9ff3ed6ecf418e99b91522e06
[MERGE]merge with trunk

bzr revid: csn@openerp.com-20121022082853-2vbk5zlwu1fks91k