[MERGE]
authorStephane Wirtel <stephane@tinyerp.com>
Mon, 2 Feb 2009 13:19:35 +0000 (14:19 +0100)
committerStephane Wirtel <stephane@tinyerp.com>
Mon, 2 Feb 2009 13:19:35 +0000 (14:19 +0100)
commitce99925890a3b457fcc2e32a881cea11735f3bf6
tree772e72d7a23c0f50c9befe6d8b3d10d8d599cc15
parentbe49c2fcec4b3019f024f9625480e494729ba7b5
parent917a29131e67f75c136ffb6090c0736d43bd3565
[MERGE]

bzr revid: stephane@tinyerp.com-20090202131935-udttnljyxtk4m6uw