[MERGE] trunk-settings-configuration-improvements
authorRaphael Collet <rco@openerp.com>
Wed, 9 May 2012 14:24:50 +0000 (16:24 +0200)
committerRaphael Collet <rco@openerp.com>
Wed, 9 May 2012 14:24:50 +0000 (16:24 +0200)
commitb0565c338ed9d5b4a1d112d2be47ae5454dd8e8d
treeb4a7f407b5dc0e6edbaa318ed6eb30069996754f
parentd1701c16b021f26326622a6196ba5e269e1ebf23
parentb461beb90878e09d15b0d525bb7074d45768b428
[MERGE] trunk-settings-configuration-improvements

bzr revid: rco@openerp.com-20120509142450-re27whun2f0bvvj5