merge
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 5 Oct 2009 12:27:31 +0000 (14:27 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 5 Oct 2009 12:27:31 +0000 (14:27 +0200)
bzr revid: fp@tinyerp.com-20091005122731-35fhj0xbqsoah5se


Trivial merge