merge of '5d835533f52a26e3b8bb1a2570a4ac5d20e8e7a6'      and 'd3291322d5661d3ab179d4b554b40c2516e33731'
merge of '5d835533f52a26e3b8bb1a2570a4ac5d20e8e7a6'
     and 'd3291322d5661d3ab179d4b554b40c2516e33731'

Monotone-Parent: 5d835533f52a26e3b8bb1a2570a4ac5d20e8e7a6
Monotone-Parent: d3291322d5661d3ab179d4b554b40c2516e33731
Monotone-Revision: 0041273d01585512fe8832e36abdf07e9decc527

Monotone-Author: 0d43d962e72edf860b600c0ee51aaa6298409546@inverse.ca
Monotone-Date: 2007-10-22T15:18:41
Monotone-Branch: ca.inverse.sogo

Distrotech/sogo,Distrotech/sogo,Distrotech/sogo,Distrotech/sogo,Distrotech/sogo