merge of '0c337b44505c67c07084efda2b6f15a785d4ee46'
authorChris Larson <clarson@kergoth.com>
Tue, 5 Sep 2006 19:27:50 +0000 (19:27 +0000)
committerChris Larson <clarson@kergoth.com>
Tue, 5 Sep 2006 19:27:50 +0000 (19:27 +0000)
     and '8b75fa29eae4798347d843e7178049453168477f'


Trivial merge