[MERGE]
authorStephane Wirtel <stephane@tinyerp.com>
Wed, 4 Feb 2009 22:24:08 +0000 (23:24 +0100)
committerStephane Wirtel <stephane@tinyerp.com>
Wed, 4 Feb 2009 22:24:08 +0000 (23:24 +0100)
bzr revid: stephane@tinyerp.com-20090204222408-z6vlwj0d3vs77jtl


Trivial merge