# HG changeset patch
# User Chris Cannam
# Date 1374836705 -3600
# Node ID fa99b4775d35d374387286f8182e6cffd659de63
# Parent  f3842da4d5101e402cababccb647fda49523165a# Parent  ac16e50930326a4826b5813a6cae58b81c721044
Merge from the default branch

diff -r f3842da4d510 -r fa99b4775d35 .hgsubstate
--- a/.hgsubstate	Wed Jul 24 18:25:45 2013 +0100
+++ b/.hgsubstate	Fri Jul 26 12:05:05 2013 +0100
@@ -1,4 +1,4 @@
-7096c7de2d4c327de5e028c33036f146a1884706 dataquay
+236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 619f715526df43e23b2b9b50715e825941572352 sv-dependency-builds
 2925a4bbca5e86036d564aaac1bcf7fd11226ca9 svapp
 a1bb2989013dc380e3baf6b6e9704520f62b3bc0 svcore
diff -r f3842da4d510 -r fa99b4775d35 main/main.cpp
--- a/main/main.cpp	Wed Jul 24 18:25:45 2013 +0100
+++ b/main/main.cpp	Fri Jul 26 12:05:05 2013 +0100
@@ -456,8 +456,6 @@
 
     cleanupMutex.unlock();
 
-    cleanupMutex.unlock();
-
     return rv;
 }