[master] Merge master and 1209b

diff --cc ChangeLog
index 71782eec299d5a92931375b5aec024583b0f4fb0,51936df9067b52c06be31b0c18ea354aebcbc49e..19d155109e0c647968d4b97a397b7a8765203900
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,11 +1,11 @@@
 -297.  [build]         jreed
++296.  [build]         jreed
+       Do not install the unittest libraries. At this time, they
+       are not useful without source tree (and they may or may
+       not have googletest support). Also, convert several makefiles
+       to build tests at "check" time and not build time.
+       (Trac #1091, git TODO)
+ 
 -296.  [bug]           jinmei
 +295.  [bug]           jinmei
        __init__.py for isc.dns was installed in the wrong directory,
        which would now make xfrin fail to start.  It was also bad
        in that it replaced any existing __init__.py in th public