From 0564e083d5a3379c0fd2f2570e7c6d9b7acc46fd Mon Sep 17 00:00:00 2001
From: Christopher Kohlhoff <chris@kohlhoff.com>
Date: Sat, 2 Jul 2011 09:18:41 +0000
Subject: [PATCH] Merge fixes from trunk:

* Fix bullet list.

* Fix include guard.

* Zero-length reads and writes need to complete immediately.

* Fix for static mutex initialisation.

Authorized by Beman


[SVN r72847]
---
 libs/asio | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/asio b/libs/asio
index 7d6c1c318d..18a48222ed 160000
--- a/libs/asio
+++ b/libs/asio
@@ -1 +1 @@
-Subproject commit 7d6c1c318dcc95c1f1bcaf2a6ffb52c9d8edc7d0
+Subproject commit 18a48222edeef468b6f5cb0663e687fda9123657