Merge branch 'master' of ssh://jreed@bind10.isc.org//var/bind10/git/bind10

ChangeLog

@@ -1,7 +1,8 @@
   163.  [func]      vorner
-	The pimpl design pattern is used in IOServer, with a shared pointer. This
+	The pimpl design pattern is used in UDPServer, with a shared pointer. This
 	makes it smaller to copy (which is done a lot as a sideeffect of being
-	coroutine) and speeds the server up by around 10%.
+	coroutine) and speeds applications of this class (notably b10-auth) up by
+	around 10%.
 	(Trac #537, git 94cb95b1d508541201fc064302ba836164d3cbe6)
 
   162.  [func]		stephen

src/lib/log/tests/run_time_init_test.sh.in

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,14 +13,12 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id$
-
 tempfile=`echo /tmp/run_init_test_$$`
 failcount=0
 localmes=@abs_builddir@/localdef.mes
 tempfile=@abs_builddir@/run_time_init_test_tempfile_$$
 
-function passfail() {
+passfail() {
     if [ $1 -eq 0 ]; then
         echo "pass"
     else