merge
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 7 Aug 2009 08:14:10 +0000 (10:14 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 7 Aug 2009 08:14:10 +0000 (10:14 +0200)
commit3a3f3bb9292960812deada5cfb3774372694c039
tree401a6aa573cfe9241b9dacbf6c4f7ace124b0186
parent5ebd3bc12cb0940d95dbfeb78e60e5a4ce174d06
parentd05bfafb5145c24561f9040bb39dba1d10318ea6
merge

bzr revid: fp@tinyerp.com-20090807081410-c12qalufv6rll3r8