From 5cf58ff2b710f7379454d135815ccc7fc08db512 Mon Sep 17 00:00:00 2001
From: zhouhaibin <283595276@qq.com>
Date: Fri, 10 Aug 2012 15:30:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'zhb/master'

Conflicts:
	src/main/java/com/alibaba/druid/support/http/StatViewServlet.java
---
 .../java/com/alibaba/druid/support/http/StatViewServlet.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java
index addaba62f1..df9fb7b460 100644
--- a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java
+++ b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java
@@ -130,7 +130,7 @@ public class StatViewServlet extends HttpServlet {
 			content.append("<h2>LastSlow SQL View:</h2>");
 			content.append("<table cellpadding='5' cellspacing='1' width='99%'>");
 			content.append("<tr>");
-			content.append("<td class='td_lable' width='130'>MaxTimespanOccurTime</td>");
+			content.append("<td class='td_lable' width='130'>SlowestSqlOccurTime</td>");
 			content.append("<td>" + format.format(sqlStat.get("MaxTimespanOccurTime")) + "</td>");
 			content.append("</tr>");
 			content.append("<tr>");