Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Fri, 20 Mar 2009 21:44:48 +0000 (14:44 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 20 Mar 2009 21:44:48 +0000 (14:44 -0700)

Trivial merge