merge
authorFabien Pinckaers <fp@tinyerp.com>
Sat, 14 Aug 2010 13:20:23 +0000 (15:20 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sat, 14 Aug 2010 13:20:23 +0000 (15:20 +0200)
commit22fb60b644132359928cfd3a5e286038c1ffab4b
treeb24b29e38afd147553988d5262e943dea160f792
parent4a308e4728dfa1d62e9a6eac2d0cce25fc8c115c
parent88c1859c3e359ba2eead335d2f07c52e8d371903
merge

bzr revid: fp@tinyerp.com-20100814132023-zhn0zulkry7r4sc8