merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 15 Sep 2009 07:43:52 +0000 (09:43 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 15 Sep 2009 07:43:52 +0000 (09:43 +0200)
commita52e36907b85532b8c0647e4da80e128cc0e5f23
treed51ced8292f989a028a83cec78b7d2cec787ffc1
parent4c3b285cbfed2c5920a5aed97e214b29e722b76c
parentb031cda61262827768d3ff87cd33b085a35012a0
merge

bzr revid: fp@tinyerp.com-20090915074352-fium6gdfmk0jqckt