merge
authorNajlaâ EL KHAYAT <nel@tinyerp.com>
Mon, 26 Jan 2009 12:17:33 +0000 (13:17 +0100)
committerNajlaâ EL KHAYAT <nel@tinyerp.com>
Mon, 26 Jan 2009 12:17:33 +0000 (13:17 +0100)
commit1e41a1241dd0a88125f3e6d185e2a00d02bf9928
tree7f05fceabadd8a10461778d0f16d065326d002a6
parent4a703d5661dd9ed7a34b6d87eb733c8b8e2b85ab
parent4d52d8dbf92c7b9edca701fc153f50a0913c474c
merge

bzr revid: nel@tinyerp.com-20090126121733-pp2tq2bnh069dgrs