merge of '00f021939a59d6bcc0871dadde8fbc81c2d0b614'

and 'e723074f5d8219ca1c6d8a8a36e8c33c8e2ba0bf'

Monotone-Parent: 00f021939a59d6bcc0871dadde8fbc81c2d0b614
Monotone-Parent: e723074f5d8219ca1c6d8a8a36e8c33c8e2ba0bf
Monotone-Revision: b1fac1b458b718d0b80ecc77aa59220107cd9ef8

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-16T15:57:56
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2009-07-16 15:57:56 +00:00

Diff Content Not Available