diff --git a/checkin_notes b/checkin_notes
index 5b3ef768f1..2dd7dda20f 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -7653,13 +7653,13 @@ David  29 Oct 2010
             login_action.php
 
 David  29 Oct 2010
-	- client and manager: fix notice titles
-	- code cleanup: please use standard coding conventions
+    - client and manager: fix notice titles
+    - code cleanup: please use standard coding conventions
 
-	client/
-		client_msgs.cpp
-	clientgui/
-		NoticeListCtrl.cpp
+    client/
+        client_msgs.cpp
+    clientgui/
+        NoticeListCtrl.cpp
 
 David  29 Oct 2010
     - client: small initial checkin for new scheduling system.
@@ -7840,3 +7840,9 @@ David  04 Nov 2010
     lib/
         gui_rpc_client_ops.cpp
         gui_rpc_client.h
+
+David  04 Nov 2010
+    - manager: show app speed and task FLOPs estimate in task Properties
+
+    clientgui/
+        DlgItemProperties.cpp
diff --git a/clientgui/DlgItemProperties.cpp b/clientgui/DlgItemProperties.cpp
index 6e84c01f67..69120d8e73 100755
--- a/clientgui/DlgItemProperties.cpp
+++ b/clientgui/DlgItemProperties.cpp
@@ -278,12 +278,21 @@ void CDlgItemProperties::renderInfos(PROJECT* project_in) {
 // show task properties
 //
 void CDlgItemProperties::renderInfos(RESULT* result) {
+    CMainDocument* pDoc = wxGetApp().GetDocument();
     wxDateTime dt;
 	wxString wxTitle = _("Properties of task ");
 	wxTitle.append(wxString(result->name, wxConvUTF8));
 	SetTitle(wxTitle);
 
-	addProperty(_("Application"), FormatApplicationName(result));
+    APP_VERSION* avp = NULL;
+    WORKUNIT* wup = NULL;
+    RESULT* r = pDoc->state.lookup_result(result->project_url, result->name);
+    if (r) {
+        avp = r->avp;
+        wup = r->wup;
+    }
+    
+    addProperty(_("Application"), FormatApplicationName(result));
 	addProperty(_("Workunit name"),wxString(result->wu_name, wxConvUTF8));
 	addProperty(_("State"), result_description(result));
     if (result->received_time) {
@@ -295,6 +304,12 @@ void CDlgItemProperties::renderInfos(RESULT* result) {
 	if (strlen(result->resources)) {
 		addProperty(_("Resources"), wxString(result->resources, wxConvUTF8));
 	}
+    if (avp) {
+        addProperty(_("Estimated app speed"), wxString::Format(wxT("%.2f GFLOPs/sec"), avp->flops/1e9));
+    }
+    if (wup) {
+        addProperty(_("Estimated task size"), wxString::Format(wxT("%.0f GFLOPs"), wup->rsc_fpops_est/1e9));
+    }
     if (result->active_task) {
 		addProperty(_("CPU time at last checkpoint"), FormatTime(result->checkpoint_cpu_time));
 		addProperty(_("CPU time"), FormatTime(result->current_cpu_time));