resolved conflicts for merge of 041c9c26 to eclair