merge of '358d6d576847344e4d6c8fd19432b87f50bdc8cd'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 19 Nov 2006 17:39:26 +0000 (17:39 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 19 Nov 2006 17:39:26 +0000 (17:39 +0000)
     and '4531506c8294a7a7da7e3abfdefb0850b34d8764'


Trivial merge