merge of '53d64b20113c9b23a5d4825ba78e6facd2a1a506'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Oct 2006 18:07:40 +0000 (18:07 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Oct 2006 18:07:40 +0000 (18:07 +0000)
     and 'a28fabd7fe7ef37dfa0b2ed9b500e579b1034bc8'


Trivial merge