Merge refs/heads/master from origin
authorCarl Baldwin <cnb@ball.(none)>
Wed, 26 Oct 2005 01:37:21 +0000 (19:37 -0600)
committerCarl Baldwin <cnb@ball.(none)>
Wed, 26 Oct 2005 01:37:21 +0000 (19:37 -0600)

Trivial merge