merge of '47946984df94ecb19a0e0f351847e1df1ec07393'

and '4d2e9e4f4237fb0b335a34870686d9bd0fedcd78'

Monotone-Parent: 47946984df94ecb19a0e0f351847e1df1ec07393
Monotone-Parent: 4d2e9e4f4237fb0b335a34870686d9bd0fedcd78
Monotone-Revision: c3ae4b113ff2c8334bbf16d65765c81a85d99929

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-14T13:22:28
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-04-14 13:22:28 +00:00

Diff Content Not Available