merge of '1eda447bcdb08adfa9f20f565bd08e963be86a92'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 18 Dec 2007 17:15:39 +0000 (17:15 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 18 Dec 2007 17:15:39 +0000 (17:15 +0000)
     and 'b98706e643fe20b21c34102738a4ce726bc5fb60'


Trivial merge