[MERGE]
authorOlivier Laurent <olt@tinyerp.com>
Sat, 18 Jul 2009 11:22:14 +0000 (13:22 +0200)
committerOlivier Laurent <olt@tinyerp.com>
Sat, 18 Jul 2009 11:22:14 +0000 (13:22 +0200)
commit639c25ab32ae21200dfa1b42c8c380f356f89c47
tree469372dd29605e73e277e6a0e0bb5496cc6f9b68
parent22ac7ba66eae2d53ded9a1dc46d9e1078db313d2
parent43b66e1a1d039a8330f3c4ebda124773702eff16
[MERGE]

bzr revid: olt@tinyerp.com-20090718112214-oryht1kbguloh8rg