From fe70df593b505f7f2c5337c5e0ea3ee1aecaff8e Mon Sep 17 00:00:00 2001
From: Kelly Martin <kelly.lynn.martin@gmail.com>
Date: Thu, 14 Feb 2013 18:36:21 -0600
Subject: [PATCH 1/2] Sync submodules

---
 library/xml        | 2 +-
 plugins/stonesense | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index c7e2c28fe..76fb647a4 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit c7e2c28febd6dca06ff7e9951090982fbbee12b5
+Subproject commit 76fb647a42ba2064d11f2a0be7bf04f6e3622bc5
diff --git a/plugins/stonesense b/plugins/stonesense
index 37f6e626b..cb97cf308 160000
--- a/plugins/stonesense
+++ b/plugins/stonesense
@@ -1 +1 @@
-Subproject commit 37f6e626b054571b72535e2ac0ee3957e07432f1
+Subproject commit cb97cf308c6e09638c0de94894473c9bd0f561fd

From 0b31fbafea78c1f655d1edf10cee42e8103e2b42 Mon Sep 17 00:00:00 2001
From: Kelly Martin <kelly.lynn.martin@gmail.com>
Date: Sat, 2 Mar 2013 23:05:09 -0600
Subject: [PATCH 2/2] Remove the "assign random labors to random dwarfs"
 nonsense that I put in while drunk or something.

---
 plugins/devel/autolabor2.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/plugins/devel/autolabor2.cpp b/plugins/devel/autolabor2.cpp
index 0d5196a77..e41ba541b 100644
--- a/plugins/devel/autolabor2.cpp
+++ b/plugins/devel/autolabor2.cpp
@@ -2158,15 +2158,6 @@ public:
             }
         }
 
-        FOR_ENUM_ITEMS(unit_labor, l)
-        {
-            if (l == df::unit_labor::NONE)
-                continue;
-            if (labor_infos[l].idle_dwarfs == 0 && labor_infos[l].busy_dwarfs > 0 &&
-                (labor_infos[l].maximum_dwarfs() == 0 || labor_needed[l] < labor_infos[l].maximum_dwarfs()))
-                pq.push(make_pair(std::min(labor_infos[l].time_since_last_assigned()/12, 25), l));
-        }
-
         if (print_debug)
             out.print("available count = %d, distinct labors needed = %d\n", available_dwarfs.size(), pq.size());