merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 12 Aug 2009 08:24:51 +0000 (10:24 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 12 Aug 2009 08:24:51 +0000 (10:24 +0200)
commit08cae88d114807165d45791b32c44dd3f93058a4
tree773b9883c61fac005086d3cf8cd5fbd125251993
parent409528810dc8d42db877af23e6e15ad2eea1f853
parentaaddaf870f48ca7a0220201446804e7cb69200e0
merge

bzr revid: fp@tinyerp.com-20090812082451-bh5y6rsnra0uymp1