[MERGE] Merge trunk
authorFabien Meghazi <fme@openerp.com>
Wed, 2 May 2012 08:16:37 +0000 (10:16 +0200)
committerFabien Meghazi <fme@openerp.com>
Wed, 2 May 2012 08:16:37 +0000 (10:16 +0200)
commit6b9f64a4a1fe242537298a54a7518d4eb9b6e94a
treeb952718a76533c34195beb1290c78e227fd39b4a
parentb5e98c044948909094ec8212f902cf6a21640d5a
parentcf322b006434e650d4ffeb51975bee416b116da1
[MERGE] Merge trunk

bzr revid: fme@openerp.com-20120502081637-pb56e2xcxdy0pqd0