merge of '834fb725cc2c056023365e8279ac4c8fd1d4a94c'

and '954bbdf61ee55d8e6a99433cfdb3a5c432584796'

Monotone-Parent: 834fb725cc2c056023365e8279ac4c8fd1d4a94c
Monotone-Parent: 954bbdf61ee55d8e6a99433cfdb3a5c432584796
Monotone-Revision: 7c7c9b116a1f28737cae823a0f0dac6a60894f7e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-11-24T01:54:23
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-11-24 01:54:23 +00:00
File diff suppressed because it is too large Load Diff