merge from trunk

git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac221@2199 e5f2f494-b856-4b98-b285-d166d9295462

src/lib/cc/session_unittests.cc

@@ -15,10 +15,13 @@
 // $Id: data_unittests.cc 1899 2010-05-21 12:03:59Z jelte $
 
 #include "config.h"
+
+// XXX: the ASIO header must be included before others.  See session.cc.
+#include <asio.hpp>
+
 #include <gtest/gtest.h>
 #include <session.h>
 
-#include <asio.hpp>
 #include <exceptions/exceptions.h>
 
 using namespace isc::cc;