[MERGE] merge
authornel@tinyerp.com <>
Mon, 29 Mar 2010 09:03:09 +0000 (11:03 +0200)
committernel@tinyerp.com <>
Mon, 29 Mar 2010 09:03:09 +0000 (11:03 +0200)
commit86c193ad0e8a32937ff45096b237ef75ba7e1be0
tree474e58c0494d50ebdbcaef8456328d3cc1970caa
parent284d02eafa3dc0a7b267706bf4175324ebe66a51
parent2b6955d42687ba480cb4a3a87da629af051a3ab4
[MERGE] merge

bzr revid: nel@tinyerp.com-20100329090309-vholpuokg2y5uh0g