merge
authorFabien Pinckaers <fp@tinyerp.com>
Sat, 13 Dec 2008 06:22:33 +0000 (07:22 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Sat, 13 Dec 2008 06:22:33 +0000 (07:22 +0100)
commit93f1f98c701c63b81b1103fdf03769755924eee9
treefc6ff4fa9b8efc7765ab61987cbb5b83e67022f3
parent940294901da80cf654930eb8525ce53b7296e42f
parent3548ede420152290bd3a8e9cac714d07f3a55124
merge

bzr revid: fp@tinyerp.com-20081213062233-ecmibg0rm5wr8neh