merge of '52aa2df47cf7bc30b6972165f60dd26369dd337c'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 14 Dec 2007 15:58:09 +0000 (15:58 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 14 Dec 2007 15:58:09 +0000 (15:58 +0000)
     and '6a57ef3dc19b0640f6623b5aa686a5c2d3f81f32'


Trivial merge