Merge commit 'b9b88351ea2c4b43a6f90938554dc5693b17e328'

Conflicts:
	libguile/deprecated.h
	test-suite/tests/00-socket.test

diff --cc doc/ref/posix.texi
Simple merge

diff --cc libguile/socket.c
Simple merge

diff --cc test-suite/tests/00-socket.test
index 30a0257,309c358..211aaaf
--- 1/test-suite/tests/00-socket.test
--- 2/test-suite/tests/00-socket.test
+++ b/test-suite/tests/00-socket.test
@@@ -1,7 -1,7 +1,7 @@@
 -;;;; socket.test --- test socket functions     -*- scheme -*-
 +;;;; 00-socket.test --- test socket functions     -*- scheme -*-
  ;;;;
  ;;;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- ;;;;   2011, 2012, 2013 Free Software Foundation, Inc.
 -;;;;   2011, 2013, 2014 Free Software Foundation, Inc.
++;;;;   2011, 2012, 2013, 2014 Free Software Foundation, Inc.
  ;;;;
  ;;;; This library is free software; you can redistribute it and/or
  ;;;; modify it under the terms of the GNU Lesser General Public