Merge branches 'master' and 'internals'
authorscott Chacon <schacon@agadorsparticus.(none)>
Tue, 27 Nov 2007 16:21:48 +0000 (27 08:21 -0800)
committerscott Chacon <schacon@agadorsparticus.(none)>
Tue, 27 Nov 2007 16:21:48 +0000 (27 08:21 -0800)

Trivial merge