1--- postgresql-9.0.4/src/backend/utils/error/elog.c	2011-04-14 20:15:44.000000000 -0700
2+++ postgresql/src/backend/utils/error/elog.c	2011-04-20 14:07:07.000000000 -0800
3@@ -2723,6 +2723,8 @@
4 	while ((ch = *str++) != '\0')
5 	{
6 		appendStringInfoCharMacro(buf, ch);
7+		if (ch == '\r')
8+			appendStringInfoChar(buf, ch = '\n');
9 		if (ch == '\n')
10 			appendStringInfoCharMacro(buf, '\t');
11 	}
12