merge of '1b5769504979ed00982f85f0ceb79250c4391a89'
authorSergey Lapin <slapinid@gmail.com>
Mon, 26 Nov 2007 13:42:17 +0000 (13:42 +0000)
committerSergey Lapin <slapinid@gmail.com>
Mon, 26 Nov 2007 13:42:17 +0000 (13:42 +0000)
commit256626d3db13a6f076f69db9ef1ab34ef1acf066
treeafe36199d4323953e7bcbbc6331de32b62c167d7
parent23a4ba0f9f76dad66e8aac67bf5908d881f52c72
parent31c361ab0e1c82f6bae82b3a2392842667dad075
Merge ... '1b5769504979ed00982f85f0ceb79250c4391a89'
     and 'fbe0639618786fa2fa92888fc0eb9bfba2b76fa3'