merged changes from RC_1_0

docs/python_binding.rst

@@ -122,7 +122,7 @@ A very simple example usage of the module would be something like this::
 	e = lt.bdecode(open("test.torrent", 'rb').read())
 	info = lt.torrent_info(e)
 
-	params = { save_path: './', \
+	params = { save_path: '.', \
 		storage_mode: lt.storage_mode_t.storage_mode_sparse, \
 		ti: info }
 	h = ses.add_torrent(params)

include/libtorrent/udp_socket.hpp

@@ -156,6 +156,10 @@ namespace libtorrent
 
 	private:
 
+		// non-copyable
+		udp_socket(udp_socket const&);
+		udp_socket& operator=(udp_socket const&);
+
 		// observers on this udp socket
 		std::vector<udp_socket_observer*> m_observers;
 		std::vector<udp_socket_observer*> m_added_observers;