[MERGE]
authornel@tinyerp.com <>
Mon, 7 Jun 2010 18:43:24 +0000 (20:43 +0200)
committernel@tinyerp.com <>
Mon, 7 Jun 2010 18:43:24 +0000 (20:43 +0200)
commit53018bfa0fe05fa7f89a5ab3aa32e8d852af7bdb
tree7f772385988343d5d542a62748dd6553615b6a0a
parent00c072a4a8271fd0324a75ae34f15abc79710401
parente93e319baf5a11eb6fcc0f4c5bbf6efbe8761ceb
[MERGE]

bzr revid: nel@tinyerp.com-20100607184324-fkfqwev1pmnlelke