merge of '22712c8613b8a7c9e5bd16bc8a75a2445ce7294c'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 12 Sep 2006 22:49:01 +0000 (22:49 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 12 Sep 2006 22:49:01 +0000 (22:49 +0000)
     and '5db3d555762b1c8d96106bfae60bec656db47eba'


Trivial merge