Merge branch 'master' into autoconf2
authorDan Nicholson <dbn.lists@gmail.com>
Thu, 13 Dec 2007 05:24:06 +0000 (21:24 -0800)
committerDan Nicholson <dbn.lists@gmail.com>
Thu, 13 Dec 2007 05:24:06 +0000 (21:24 -0800)

Trivial merge