merge of '00ee303d8d48b4b6a0a7480dea928c8d02252f80'
authorMatt Reimer <mattjreimer@gmail.com>
Tue, 14 Nov 2006 23:09:05 +0000 (23:09 +0000)
committerMatt Reimer <mattjreimer@gmail.com>
Tue, 14 Nov 2006 23:09:05 +0000 (23:09 +0000)
     and '376cbb96ee80de7e5cc9e7ceff199d6f09fe42d8'


Trivial merge