merge
authorFabien Pinckaers <fp@tinyerp.com>
Sun, 17 Oct 2010 18:26:15 +0000 (20:26 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sun, 17 Oct 2010 18:26:15 +0000 (20:26 +0200)
commit3ab81c054474abe6d6181bf3888042df0f2d7a27
tree828bef12d77d3d913151b13c562f9925ae8632cc
parentac8476b51e4e382422038b8a6054fac25e97df3f
parent51acd5e8a60325d0bb18eadeb5ebeafa8aa4fdeb
merge

bzr revid: fp@tinyerp.com-20101017182615-fkr1vp682ru3e32s