# HG changeset patch
# User Luke Dashjr <luke-jr+git@utopios.org>
# Date 1335558480 14400
# Node ID c75b347b2fc91e9cb131f3568e099309a16b8dcf
# Parent  745ef072286e7df7b7158d085c014956240be020# Parent  e128a56635d5e16eadcf9a519608e10c659b5479
Merge branch '0.5.x' into 0.6.0.x

diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -2421,7 +2421,7 @@
         acceptor.bind(endpoint);
         acceptor.listen(socket_base::max_connections);
     }
-    catch(system::system_error &e)
+    catch(boost::system::system_error &e)
     {
         HACK_SHUTDOWN = true;
         ThreadSafeMessageBox(strprintf(_("An error occured while setting up the RPC port %i for listening: %s"), endpoint.port(), e.what()),