Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Fri, 26 Sep 2008 14:07:40 +0000 (07:07 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 26 Sep 2008 14:07:40 +0000 (07:07 -0700)
Trivial merge