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

Trivial merge