merge_trunk
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 16 Jul 2012 08:53:34 +0000 (10:53 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 16 Jul 2012 08:53:34 +0000 (10:53 +0200)
bzr revid: fp@tinyerp.com-20120716085334-57zztd74wsr8wzgf


Trivial merge