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)
commita79128b875d88ade5c94fe44cc312ccf0e45ea89
tree3b4990f970a529590c50324936093e2cc6a737ab
parent9429a72800a3b1e822751476a8bee8b3e8ff99e7
parentc739c90870fb4686a6d3184d70da5c5b8215d5a2
merge

bzr revid: fp@tinyerp.com-20091005122731-35fhj0xbqsoah5se