merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 15 Sep 2009 11:26:18 +0000 (13:26 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 15 Sep 2009 11:26:18 +0000 (13:26 +0200)
commitd67f9e8085c48ed7ba244a1417bab62364fdb020
tree784d8719e7eaadc6a9b9255b24324495b05dc196
parent7cb036f0e13e7816685cb8a24e18950247d487a5
parent4e81bf70fc1c9d48d40648fb723441eab681af1b
merge

bzr revid: fp@tinyerp.com-20090915112618-uyonjcy3ap3e7ob1